Ysurac /
FlightAirMap
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | 6 | $orderby = $Spotter->getOrderBy(); |
| 7 | 7 | |
| 8 | -$ask = filter_input(INPUT_GET,'ask',FILTER_SANITIZE_STRING); |
|
| 8 | +$ask = filter_input(INPUT_GET, 'ask', FILTER_SANITIZE_STRING); |
|
| 9 | 9 | if ($ask == 'aircraftsdetected') { |
| 10 | 10 | require_once('require/class.SpotterLive.php'); |
| 11 | 11 | $SpotterLive = new SpotterLive(); |
@@ -24,15 +24,15 @@ discard block |
||
| 24 | 24 | } elseif ($ask == 'manufacturer') { |
| 25 | 25 | $manufacturers = $Spotter->getAllManufacturers(); |
| 26 | 26 | $all_manufacturers = array(); |
| 27 | - foreach($manufacturers as $manufacturer) |
|
| 27 | + foreach ($manufacturers as $manufacturer) |
|
| 28 | 28 | { |
| 29 | - $all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ','-',$manufacturer['aircraft_manufacturer']))); |
|
| 29 | + $all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ', '-', $manufacturer['aircraft_manufacturer']))); |
|
| 30 | 30 | } |
| 31 | 31 | echo json_encode($all_manufacturers); |
| 32 | 32 | } elseif ($ask == 'aircrafttypes') { |
| 33 | 33 | $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 34 | 34 | $all_aircraft_types = array(); |
| 35 | - foreach($aircraft_types as $aircraft_type) |
|
| 35 | + foreach ($aircraft_types as $aircraft_type) |
|
| 36 | 36 | { |
| 37 | 37 | $all_aircraft_types[] = array('id' => $aircraft_type['aircraft_icao'], 'value' => $aircraft_type['aircraft_name'].' ('.$aircraft_type['aircraft_icao'].')'); |
| 38 | 38 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | } elseif ($ask == 'airlinenames') { |
| 41 | 41 | $airline_names = $Spotter->getAllAirlineNames(); |
| 42 | 42 | $all_airline_names = array(); |
| 43 | - foreach($airline_names as $airline_name) |
|
| 43 | + foreach ($airline_names as $airline_name) |
|
| 44 | 44 | { |
| 45 | 45 | $all_airline_names[] = array('id' => $airline_name['airline_icao'], 'value' => $airline_name['airline_name'].' ('.$airline_name['airline_icao'].')'); |
| 46 | 46 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | } elseif ($ask == 'airlinecountries') { |
| 49 | 49 | $airline_countries = $Spotter->getAllAirlineCountries(); |
| 50 | 50 | $all_airline_countries = array(); |
| 51 | - foreach($airline_countries as $airline_country) |
|
| 51 | + foreach ($airline_countries as $airline_country) |
|
| 52 | 52 | { |
| 53 | 53 | $all_airline_countries[] = array('id' => $airline_country['airline_country'], 'value' => $airline_country['airline_country']); |
| 54 | 54 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | $airport_names = $Spotter->getAllAirportNames(); |
| 58 | 58 | ksort($airport_names); |
| 59 | 59 | $all_airport_names = array(); |
| 60 | - foreach($airport_names as $airport_name) |
|
| 60 | + foreach ($airport_names as $airport_name) |
|
| 61 | 61 | { |
| 62 | 62 | $all_airport_names[] = array('id' => $airport_name['airport_icao'], 'value' => $airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')'); |
| 63 | 63 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | } elseif ($ask == 'airportcountries') { |
| 66 | 66 | $airport_countries = $Spotter->getAllAirportCountries(); |
| 67 | 67 | $all_airport_countries = array(); |
| 68 | - foreach($airport_countries as $airport_country) |
|
| 68 | + foreach ($airport_countries as $airport_country) |
|
| 69 | 69 | { |
| 70 | 70 | $all_airport_countries[] = array('id' => $airport_country['airport_country'], 'value' => $airport_country['airport_country']); |
| 71 | 71 | } |
@@ -91,6 +91,10 @@ |
||
| 91 | 91 | $this->rlatres = (($this->height - 1) / 180.0); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | + /** |
|
| 95 | + * @param integer $ix |
|
| 96 | + * @param integer $iy |
|
| 97 | + */ |
|
| 94 | 98 | private function _rawval($ix,$iy) { |
| 95 | 99 | if (($iy < 0)) { |
| 96 | 100 | $iy = -$iy; |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * Translated to PHP of GeographicLib/src/Geoid.cpp |
| 12 | 12 | * by Ycarus <[email protected]> in 2017 |
| 13 | 13 | */ |
| 14 | -class GeoidHeight { |
|
| 14 | +class GeoidHeight { |
|
| 15 | 15 | private $c0 = 240; |
| 16 | 16 | private $c3 = [[9, -18, -88, 0, 96, 90, 0, 0, -60, -20], [-9, 18, 8, 0, -96, 30, 0, 0, 60, -20], [9, -88, -18, 90, 96, 0, -20, -60, 0, 0], [186, -42, -42, -150, -96, -150, 60, 60, 60, 60], [54, 162, -78, 30, -24, -90, -60, 60, -60, 60], [-9, -32, 18, 30, 24, 0, 20, -60, 0, 0], [-9, 8, 18, 30, -96, 0, -20, 60, 0, 0], [54, -78, 162, -90, -24, 30, 60, -60, 60, -60], [-54, 78, 78, 90, 144, 90, -60, -60, -60, -60], [9, -8, -18, -30, -24, 0, 20, 60, 0, 0], [-9, 18, -32, 0, 24, 30, 0, 0, -60, 20], [9, -18, -8, 0, -24, -30, 0, 0, 60, 20]]; |
| 17 | 17 | private $c0n = 372; |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | private $v10 = null; |
| 35 | 35 | private $v11 = null; |
| 36 | 36 | |
| 37 | - public function __construct($name='') { |
|
| 37 | + public function __construct($name = '') { |
|
| 38 | 38 | global $globalGeoidSource; |
| 39 | 39 | //if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm'; |
| 40 | 40 | if ($name == '') { |
@@ -42,35 +42,35 @@ discard block |
||
| 42 | 42 | else $name = dirname(__FILE__).'/../data/egm96-15.pgm'; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - $f = @fopen($name,"r"); |
|
| 45 | + $f = @fopen($name, "r"); |
|
| 46 | 46 | if ($f === FALSE) { |
| 47 | 47 | throw new Exception("Can't open ".$name); |
| 48 | 48 | } |
| 49 | - $line = fgets($f,4096); |
|
| 49 | + $line = fgets($f, 4096); |
|
| 50 | 50 | if (trim($line) != 'P5') { |
| 51 | 51 | throw new Exception('No PGM header'); |
| 52 | 52 | } |
| 53 | 53 | $headerlen = strlen($line); |
| 54 | 54 | while (true) { |
| 55 | - $line = fgets($f,4096); |
|
| 55 | + $line = fgets($f, 4096); |
|
| 56 | 56 | if ((strlen($line) == 0)) { |
| 57 | 57 | throw new Exception('EOF before end of file header'); |
| 58 | 58 | } |
| 59 | 59 | $headerlen += strlen($line); |
| 60 | - if (strpos($line,'# Offset ') !== FALSE) { |
|
| 60 | + if (strpos($line, '# Offset ') !== FALSE) { |
|
| 61 | 61 | $this->offset = substr($line, 9); |
| 62 | - } else if (strpos($line,'# Scale ') !== FALSE) { |
|
| 62 | + } else if (strpos($line, '# Scale ') !== FALSE) { |
|
| 63 | 63 | $this->scale = substr($line, 8); |
| 64 | - } else if ((strpos($line,'#') === FALSE)) { |
|
| 65 | - list($this->width, $this->height) = preg_split('/\s+/',$line); |
|
| 64 | + } else if ((strpos($line, '#') === FALSE)) { |
|
| 65 | + list($this->width, $this->height) = preg_split('/\s+/', $line); |
|
| 66 | 66 | break; |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | - $line = fgets($f,4096); |
|
| 69 | + $line = fgets($f, 4096); |
|
| 70 | 70 | $headerlen += strlen($line); |
| 71 | - $levels = (int)$line; |
|
| 72 | - $this->width = (int)$this->width; |
|
| 73 | - $this->height = (int)$this->height; |
|
| 71 | + $levels = (int) $line; |
|
| 72 | + $this->width = (int) $this->width; |
|
| 73 | + $this->height = (int) $this->height; |
|
| 74 | 74 | if (($levels != 65535)) { |
| 75 | 75 | throw new Exception('PGM file must have 65535 gray levels ('.$levels.')'); |
| 76 | 76 | } |
@@ -85,42 +85,42 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | $fullsize = filesize($name); |
| 88 | - if ((($fullsize - $headerlen) != (($this->width * $this->height) * 2))) { |
|
| 88 | + if ((($fullsize - $headerlen) != (($this->width*$this->height)*2))) { |
|
| 89 | 89 | throw new Exception('File has the wrong length'); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | $this->headerlen = $headerlen; |
| 93 | - $this->raw= $f; |
|
| 94 | - $this->rlonres = ($this->width / 360.0); |
|
| 95 | - $this->rlatres = (($this->height - 1) / 180.0); |
|
| 93 | + $this->raw = $f; |
|
| 94 | + $this->rlonres = ($this->width/360.0); |
|
| 95 | + $this->rlatres = (($this->height - 1)/180.0); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - private function _rawval($ix,$iy) { |
|
| 98 | + private function _rawval($ix, $iy) { |
|
| 99 | 99 | if (($iy < 0)) { |
| 100 | 100 | $iy = -$iy; |
| 101 | - $ix += ($this->width / 2); |
|
| 101 | + $ix += ($this->width/2); |
|
| 102 | 102 | } else if (($iy >= $this->height)) { |
| 103 | - $iy = ((2 * ($this->height - 1)) - $iy); |
|
| 104 | - $ix += ($this->width / 2); |
|
| 103 | + $iy = ((2*($this->height - 1)) - $iy); |
|
| 104 | + $ix += ($this->width/2); |
|
| 105 | 105 | } |
| 106 | 106 | if (($ix < 0)) { |
| 107 | 107 | $ix += $this->width; |
| 108 | 108 | } else if (($ix >= $this->width)) { |
| 109 | 109 | $ix -= $this->width; |
| 110 | 110 | } |
| 111 | - $k = ((($iy * $this->width) + $ix) * 2) + $this->headerlen; |
|
| 112 | - fseek($this->raw,$k); |
|
| 113 | - return unpack('n',fread($this->raw,2))[1]; |
|
| 111 | + $k = ((($iy*$this->width) + $ix)*2) + $this->headerlen; |
|
| 112 | + fseek($this->raw, $k); |
|
| 113 | + return unpack('n', fread($this->raw, 2))[1]; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | - public function get($lat,$lon,$cubic=true) { |
|
| 116 | + public function get($lat, $lon, $cubic = true) { |
|
| 117 | 117 | if (($lon < 0)) { |
| 118 | 118 | $lon += 360; |
| 119 | 119 | } |
| 120 | - $fy = ((90 - $lat) * $this->rlatres); |
|
| 121 | - $fx = ($lon * $this->rlonres); |
|
| 122 | - $iy = (int)$fy; |
|
| 123 | - $ix = (int)$fx; |
|
| 120 | + $fy = ((90 - $lat)*$this->rlatres); |
|
| 121 | + $fx = ($lon*$this->rlonres); |
|
| 122 | + $iy = (int) $fy; |
|
| 123 | + $ix = (int) $fx; |
|
| 124 | 124 | $fx -= $ix; |
| 125 | 125 | $fy -= $iy; |
| 126 | 126 | $t = array(); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $c3x = $this->c3; |
| 148 | 148 | $c0x = $this->c0; |
| 149 | 149 | } |
| 150 | - for ($i = 0; $i < 10;++$i) { |
|
| 150 | + for ($i = 0; $i < 10; ++$i) { |
|
| 151 | 151 | $t[$i] = 0; |
| 152 | 152 | for ($j = 0; $j < 12; ++$j) { |
| 153 | 153 | $t[$i] += $v[$j]*$c3x[$j][$i]; |
@@ -158,13 +158,13 @@ discard block |
||
| 158 | 158 | $this->t = $t; |
| 159 | 159 | } else $t = $this->t; |
| 160 | 160 | if (!($cubic)) { |
| 161 | - $a = (((1 - $fx) * $this->v00) + ($fx * $this->v01)); |
|
| 162 | - $b = (((1 - $fx) * $this->v10) + ($fx * $this->v11)); |
|
| 163 | - $h = (((1 - $fy) * $a) + ($fy * $b)); |
|
| 161 | + $a = (((1 - $fx)*$this->v00) + ($fx*$this->v01)); |
|
| 162 | + $b = (((1 - $fx)*$this->v10) + ($fx*$this->v11)); |
|
| 163 | + $h = (((1 - $fy)*$a) + ($fy*$b)); |
|
| 164 | 164 | } else { |
| 165 | - $h = (($t[0] + ($fx * ($t[1] + ($fx * ($t[3] + ($fx * $t[6])))))) + ($fy * (($t[2] + ($fx * ($t[4] + ($fx * $t[7])))) + ($fy * (($t[5] + ($fx * $t[8])) + ($fy * $t[9])))))); |
|
| 165 | + $h = (($t[0] + ($fx*($t[1] + ($fx*($t[3] + ($fx*$t[6])))))) + ($fy*(($t[2] + ($fx*($t[4] + ($fx*$t[7])))) + ($fy*(($t[5] + ($fx*$t[8])) + ($fy*$t[9])))))); |
|
| 166 | 166 | } |
| 167 | - return ((float)$this->offset + ((float)$this->scale * (float)$h)); |
|
| 167 | + return ((float) $this->offset + ((float) $this->scale*(float) $h)); |
|
| 168 | 168 | } |
| 169 | 169 | } |
| 170 | 170 | /* |
@@ -38,8 +38,11 @@ discard block |
||
| 38 | 38 | global $globalGeoidSource; |
| 39 | 39 | //if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm'; |
| 40 | 40 | if ($name == '') { |
| 41 | - if (isset($globalGeoidSource) && $globalGeoidSource != '') $name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'; |
|
| 42 | - else $name = dirname(__FILE__).'/../data/egm96-15.pgm'; |
|
| 41 | + if (isset($globalGeoidSource) && $globalGeoidSource != '') { |
|
| 42 | + $name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'; |
|
| 43 | + } else { |
|
| 44 | + $name = dirname(__FILE__).'/../data/egm96-15.pgm'; |
|
| 45 | + } |
|
| 43 | 46 | } |
| 44 | 47 | |
| 45 | 48 | $f = @fopen($name,"r"); |
@@ -156,7 +159,9 @@ discard block |
||
| 156 | 159 | } |
| 157 | 160 | } |
| 158 | 161 | $this->t = $t; |
| 159 | - } else $t = $this->t; |
|
| 162 | + } else { |
|
| 163 | + $t = $this->t; |
|
| 164 | + } |
|
| 160 | 165 | if (!($cubic)) { |
| 161 | 166 | $a = (((1 - $fx) * $this->v00) + ($fx * $this->v01)); |
| 162 | 167 | $b = (((1 - $fx) * $this->v10) + ($fx * $this->v11)); |
@@ -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 | |
@@ -821,14 +821,14 @@ discard block |
||
| 821 | 821 | } |
| 822 | 822 | if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
| 823 | 823 | // Add aircraft_manufacturer to stats_aircraft |
| 824 | - $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
|
| 824 | + $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
|
| 825 | 825 | try { |
| 826 | 826 | $sth = $Connection->db->prepare($query); |
| 827 | 827 | $sth->execute(); |
| 828 | 828 | } catch(PDOException $e) { |
| 829 | 829 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 830 | - } |
|
| 831 | - } |
|
| 830 | + } |
|
| 831 | + } |
|
| 832 | 832 | |
| 833 | 833 | $query = "UPDATE config SET value = '24' WHERE name = 'schema_version'"; |
| 834 | 834 | try { |
@@ -1176,7 +1176,7 @@ discard block |
||
| 1176 | 1176 | } catch(PDOException $e) { |
| 1177 | 1177 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1178 | 1178 | } |
| 1179 | - } |
|
| 1179 | + } |
|
| 1180 | 1180 | if (!$Connection->checkColumnName('aircraft','mfr')) { |
| 1181 | 1181 | // Add mfr to aircraft |
| 1182 | 1182 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
@@ -1250,7 +1250,7 @@ discard block |
||
| 1250 | 1250 | } catch(PDOException $e) { |
| 1251 | 1251 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1252 | 1252 | } |
| 1253 | - } |
|
| 1253 | + } |
|
| 1254 | 1254 | if (!$Connection->indexExists('accidents','registration_idx')) { |
| 1255 | 1255 | // Add index key |
| 1256 | 1256 | $query = "create index registration_idx on accidents (registration)"; |
@@ -1260,7 +1260,7 @@ discard block |
||
| 1260 | 1260 | } catch(PDOException $e) { |
| 1261 | 1261 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1262 | 1262 | } |
| 1263 | - } |
|
| 1263 | + } |
|
| 1264 | 1264 | if (!$Connection->indexExists('accidents','rdts')) { |
| 1265 | 1265 | // Add index key |
| 1266 | 1266 | $query = "create index rdts on accidents (registration,date,type,source)"; |
@@ -1270,7 +1270,7 @@ discard block |
||
| 1270 | 1270 | } catch(PDOException $e) { |
| 1271 | 1271 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1272 | 1272 | } |
| 1273 | - } |
|
| 1273 | + } |
|
| 1274 | 1274 | |
| 1275 | 1275 | $query = "UPDATE config SET value = '31' WHERE name = 'schema_version'"; |
| 1276 | 1276 | try { |
@@ -1562,7 +1562,7 @@ discard block |
||
| 1562 | 1562 | } catch(PDOException $e) { |
| 1563 | 1563 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1564 | 1564 | } |
| 1565 | - } |
|
| 1565 | + } |
|
| 1566 | 1566 | $query = "UPDATE config SET value = '36' WHERE name = 'schema_version'"; |
| 1567 | 1567 | try { |
| 1568 | 1568 | $sth = $Connection->db->prepare($query); |
@@ -1723,7 +1723,7 @@ discard block |
||
| 1723 | 1723 | } catch(PDOException $e) { |
| 1724 | 1724 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1725 | 1725 | } |
| 1726 | - } |
|
| 1726 | + } |
|
| 1727 | 1727 | $query = "UPDATE config SET value = '38' WHERE name = 'schema_version'"; |
| 1728 | 1728 | try { |
| 1729 | 1729 | $sth = $Connection->db->prepare($query); |
@@ -2129,205 +2129,205 @@ discard block |
||
| 2129 | 2129 | |
| 2130 | 2130 | |
| 2131 | 2131 | |
| 2132 | - public static function check_version($update = false) { |
|
| 2133 | - global $globalDBname; |
|
| 2134 | - $version = 0; |
|
| 2135 | - $Connection = new Connection(); |
|
| 2136 | - if ($Connection->tableExists('aircraft')) { |
|
| 2137 | - if (!$Connection->tableExists('config')) { |
|
| 2138 | - $version = '1'; |
|
| 2139 | - if ($update) return self::update_from_1(); |
|
| 2140 | - else return $version; |
|
| 2132 | + public static function check_version($update = false) { |
|
| 2133 | + global $globalDBname; |
|
| 2134 | + $version = 0; |
|
| 2135 | + $Connection = new Connection(); |
|
| 2136 | + if ($Connection->tableExists('aircraft')) { |
|
| 2137 | + if (!$Connection->tableExists('config')) { |
|
| 2138 | + $version = '1'; |
|
| 2139 | + if ($update) return self::update_from_1(); |
|
| 2140 | + else return $version; |
|
| 2141 | 2141 | } else { |
| 2142 | - $Connection = new Connection(); |
|
| 2143 | - $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
|
| 2144 | - try { |
|
| 2145 | - $sth = $Connection->db->prepare($query); |
|
| 2146 | - $sth->execute(); |
|
| 2147 | - } catch(PDOException $e) { |
|
| 2142 | + $Connection = new Connection(); |
|
| 2143 | + $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
|
| 2144 | + try { |
|
| 2145 | + $sth = $Connection->db->prepare($query); |
|
| 2146 | + $sth->execute(); |
|
| 2147 | + } catch(PDOException $e) { |
|
| 2148 | 2148 | return "error : ".$e->getMessage()."\n"; |
| 2149 | - } |
|
| 2150 | - $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2151 | - if ($update) { |
|
| 2152 | - if ($result['value'] == '2') { |
|
| 2153 | - $error = self::update_from_2(); |
|
| 2154 | - if ($error != '') return $error; |
|
| 2155 | - else return self::check_version(true); |
|
| 2156 | - } elseif ($result['value'] == '3') { |
|
| 2157 | - $error = self::update_from_3(); |
|
| 2158 | - if ($error != '') return $error; |
|
| 2159 | - else return self::check_version(true); |
|
| 2160 | - } elseif ($result['value'] == '4') { |
|
| 2161 | - $error = self::update_from_4(); |
|
| 2162 | - if ($error != '') return $error; |
|
| 2163 | - else return self::check_version(true); |
|
| 2164 | - } elseif ($result['value'] == '5') { |
|
| 2165 | - $error = self::update_from_5(); |
|
| 2166 | - if ($error != '') return $error; |
|
| 2167 | - else return self::check_version(true); |
|
| 2168 | - } elseif ($result['value'] == '6') { |
|
| 2169 | - $error = self::update_from_6(); |
|
| 2170 | - if ($error != '') return $error; |
|
| 2171 | - else return self::check_version(true); |
|
| 2172 | - } elseif ($result['value'] == '7') { |
|
| 2173 | - $error = self::update_from_7(); |
|
| 2174 | - if ($error != '') return $error; |
|
| 2175 | - else return self::check_version(true); |
|
| 2176 | - } elseif ($result['value'] == '8') { |
|
| 2177 | - $error = self::update_from_8(); |
|
| 2178 | - if ($error != '') return $error; |
|
| 2179 | - else return self::check_version(true); |
|
| 2180 | - } elseif ($result['value'] == '9') { |
|
| 2181 | - $error = self::update_from_9(); |
|
| 2182 | - if ($error != '') return $error; |
|
| 2183 | - else return self::check_version(true); |
|
| 2184 | - } elseif ($result['value'] == '10') { |
|
| 2185 | - $error = self::update_from_10(); |
|
| 2186 | - if ($error != '') return $error; |
|
| 2187 | - else return self::check_version(true); |
|
| 2188 | - } elseif ($result['value'] == '11') { |
|
| 2189 | - $error = self::update_from_11(); |
|
| 2190 | - if ($error != '') return $error; |
|
| 2191 | - else return self::check_version(true); |
|
| 2192 | - } elseif ($result['value'] == '12') { |
|
| 2193 | - $error = self::update_from_12(); |
|
| 2194 | - if ($error != '') return $error; |
|
| 2195 | - else return self::check_version(true); |
|
| 2196 | - } elseif ($result['value'] == '13') { |
|
| 2197 | - $error = self::update_from_13(); |
|
| 2198 | - if ($error != '') return $error; |
|
| 2199 | - else return self::check_version(true); |
|
| 2200 | - } elseif ($result['value'] == '14') { |
|
| 2201 | - $error = self::update_from_14(); |
|
| 2202 | - if ($error != '') return $error; |
|
| 2203 | - else return self::check_version(true); |
|
| 2204 | - } elseif ($result['value'] == '15') { |
|
| 2205 | - $error = self::update_from_15(); |
|
| 2206 | - if ($error != '') return $error; |
|
| 2207 | - else return self::check_version(true); |
|
| 2208 | - } elseif ($result['value'] == '16') { |
|
| 2209 | - $error = self::update_from_16(); |
|
| 2210 | - if ($error != '') return $error; |
|
| 2211 | - else return self::check_version(true); |
|
| 2212 | - } elseif ($result['value'] == '17') { |
|
| 2213 | - $error = self::update_from_17(); |
|
| 2214 | - if ($error != '') return $error; |
|
| 2215 | - else return self::check_version(true); |
|
| 2216 | - } elseif ($result['value'] == '18') { |
|
| 2217 | - $error = self::update_from_18(); |
|
| 2218 | - if ($error != '') return $error; |
|
| 2219 | - else return self::check_version(true); |
|
| 2220 | - } elseif ($result['value'] == '19') { |
|
| 2221 | - $error = self::update_from_19(); |
|
| 2222 | - if ($error != '') return $error; |
|
| 2223 | - else return self::check_version(true); |
|
| 2224 | - } elseif ($result['value'] == '20') { |
|
| 2225 | - $error = self::update_from_20(); |
|
| 2226 | - if ($error != '') return $error; |
|
| 2227 | - else return self::check_version(true); |
|
| 2228 | - } elseif ($result['value'] == '21') { |
|
| 2229 | - $error = self::update_from_21(); |
|
| 2230 | - if ($error != '') return $error; |
|
| 2231 | - else return self::check_version(true); |
|
| 2232 | - } elseif ($result['value'] == '22') { |
|
| 2233 | - $error = self::update_from_22(); |
|
| 2234 | - if ($error != '') return $error; |
|
| 2235 | - else return self::check_version(true); |
|
| 2236 | - } elseif ($result['value'] == '23') { |
|
| 2237 | - $error = self::update_from_23(); |
|
| 2238 | - if ($error != '') return $error; |
|
| 2239 | - else return self::check_version(true); |
|
| 2240 | - } elseif ($result['value'] == '24') { |
|
| 2241 | - $error = self::update_from_24(); |
|
| 2242 | - if ($error != '') return $error; |
|
| 2243 | - else return self::check_version(true); |
|
| 2244 | - } elseif ($result['value'] == '25') { |
|
| 2245 | - $error = self::update_from_25(); |
|
| 2246 | - if ($error != '') return $error; |
|
| 2247 | - else return self::check_version(true); |
|
| 2248 | - } elseif ($result['value'] == '26') { |
|
| 2249 | - $error = self::update_from_26(); |
|
| 2250 | - if ($error != '') return $error; |
|
| 2251 | - else return self::check_version(true); |
|
| 2252 | - } elseif ($result['value'] == '27') { |
|
| 2253 | - $error = self::update_from_27(); |
|
| 2254 | - if ($error != '') return $error; |
|
| 2255 | - else return self::check_version(true); |
|
| 2256 | - } elseif ($result['value'] == '28') { |
|
| 2257 | - $error = self::update_from_28(); |
|
| 2258 | - if ($error != '') return $error; |
|
| 2259 | - else return self::check_version(true); |
|
| 2260 | - } elseif ($result['value'] == '29') { |
|
| 2261 | - $error = self::update_from_29(); |
|
| 2262 | - if ($error != '') return $error; |
|
| 2263 | - else return self::check_version(true); |
|
| 2264 | - } elseif ($result['value'] == '30') { |
|
| 2265 | - $error = self::update_from_30(); |
|
| 2266 | - if ($error != '') return $error; |
|
| 2267 | - else return self::check_version(true); |
|
| 2268 | - } elseif ($result['value'] == '31') { |
|
| 2269 | - $error = self::update_from_31(); |
|
| 2270 | - if ($error != '') return $error; |
|
| 2271 | - else return self::check_version(true); |
|
| 2272 | - } elseif ($result['value'] == '32') { |
|
| 2273 | - $error = self::update_from_32(); |
|
| 2274 | - if ($error != '') return $error; |
|
| 2275 | - else return self::check_version(true); |
|
| 2276 | - } elseif ($result['value'] == '33') { |
|
| 2277 | - $error = self::update_from_33(); |
|
| 2278 | - if ($error != '') return $error; |
|
| 2279 | - else return self::check_version(true); |
|
| 2280 | - } elseif ($result['value'] == '34') { |
|
| 2281 | - $error = self::update_from_34(); |
|
| 2282 | - if ($error != '') return $error; |
|
| 2283 | - else return self::check_version(true); |
|
| 2284 | - } elseif ($result['value'] == '35') { |
|
| 2285 | - $error = self::update_from_35(); |
|
| 2286 | - if ($error != '') return $error; |
|
| 2287 | - else return self::check_version(true); |
|
| 2288 | - } elseif ($result['value'] == '36') { |
|
| 2289 | - $error = self::update_from_36(); |
|
| 2290 | - if ($error != '') return $error; |
|
| 2291 | - else return self::check_version(true); |
|
| 2292 | - } elseif ($result['value'] == '37') { |
|
| 2293 | - $error = self::update_from_37(); |
|
| 2294 | - if ($error != '') return $error; |
|
| 2295 | - else return self::check_version(true); |
|
| 2296 | - } elseif ($result['value'] == '38') { |
|
| 2297 | - $error = self::update_from_38(); |
|
| 2298 | - if ($error != '') return $error; |
|
| 2299 | - else return self::check_version(true); |
|
| 2300 | - } elseif ($result['value'] == '39') { |
|
| 2301 | - $error = self::update_from_39(); |
|
| 2302 | - if ($error != '') return $error; |
|
| 2303 | - else return self::check_version(true); |
|
| 2304 | - } elseif ($result['value'] == '40') { |
|
| 2305 | - $error = self::update_from_40(); |
|
| 2306 | - if ($error != '') return $error; |
|
| 2307 | - else return self::check_version(true); |
|
| 2308 | - } elseif ($result['value'] == '41') { |
|
| 2309 | - $error = self::update_from_41(); |
|
| 2310 | - if ($error != '') return $error; |
|
| 2311 | - else return self::check_version(true); |
|
| 2312 | - } elseif ($result['value'] == '42') { |
|
| 2313 | - $error = self::update_from_42(); |
|
| 2314 | - if ($error != '') return $error; |
|
| 2315 | - else return self::check_version(true); |
|
| 2316 | - } elseif ($result['value'] == '43') { |
|
| 2317 | - $error = self::update_from_43(); |
|
| 2318 | - if ($error != '') return $error; |
|
| 2319 | - else return self::check_version(true); |
|
| 2320 | - } elseif ($result['value'] == '44') { |
|
| 2321 | - $error = self::update_from_44(); |
|
| 2322 | - if ($error != '') return $error; |
|
| 2323 | - else return self::check_version(true); |
|
| 2324 | - } else return ''; |
|
| 2325 | - } |
|
| 2326 | - else return $result['value']; |
|
| 2149 | + } |
|
| 2150 | + $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2151 | + if ($update) { |
|
| 2152 | + if ($result['value'] == '2') { |
|
| 2153 | + $error = self::update_from_2(); |
|
| 2154 | + if ($error != '') return $error; |
|
| 2155 | + else return self::check_version(true); |
|
| 2156 | + } elseif ($result['value'] == '3') { |
|
| 2157 | + $error = self::update_from_3(); |
|
| 2158 | + if ($error != '') return $error; |
|
| 2159 | + else return self::check_version(true); |
|
| 2160 | + } elseif ($result['value'] == '4') { |
|
| 2161 | + $error = self::update_from_4(); |
|
| 2162 | + if ($error != '') return $error; |
|
| 2163 | + else return self::check_version(true); |
|
| 2164 | + } elseif ($result['value'] == '5') { |
|
| 2165 | + $error = self::update_from_5(); |
|
| 2166 | + if ($error != '') return $error; |
|
| 2167 | + else return self::check_version(true); |
|
| 2168 | + } elseif ($result['value'] == '6') { |
|
| 2169 | + $error = self::update_from_6(); |
|
| 2170 | + if ($error != '') return $error; |
|
| 2171 | + else return self::check_version(true); |
|
| 2172 | + } elseif ($result['value'] == '7') { |
|
| 2173 | + $error = self::update_from_7(); |
|
| 2174 | + if ($error != '') return $error; |
|
| 2175 | + else return self::check_version(true); |
|
| 2176 | + } elseif ($result['value'] == '8') { |
|
| 2177 | + $error = self::update_from_8(); |
|
| 2178 | + if ($error != '') return $error; |
|
| 2179 | + else return self::check_version(true); |
|
| 2180 | + } elseif ($result['value'] == '9') { |
|
| 2181 | + $error = self::update_from_9(); |
|
| 2182 | + if ($error != '') return $error; |
|
| 2183 | + else return self::check_version(true); |
|
| 2184 | + } elseif ($result['value'] == '10') { |
|
| 2185 | + $error = self::update_from_10(); |
|
| 2186 | + if ($error != '') return $error; |
|
| 2187 | + else return self::check_version(true); |
|
| 2188 | + } elseif ($result['value'] == '11') { |
|
| 2189 | + $error = self::update_from_11(); |
|
| 2190 | + if ($error != '') return $error; |
|
| 2191 | + else return self::check_version(true); |
|
| 2192 | + } elseif ($result['value'] == '12') { |
|
| 2193 | + $error = self::update_from_12(); |
|
| 2194 | + if ($error != '') return $error; |
|
| 2195 | + else return self::check_version(true); |
|
| 2196 | + } elseif ($result['value'] == '13') { |
|
| 2197 | + $error = self::update_from_13(); |
|
| 2198 | + if ($error != '') return $error; |
|
| 2199 | + else return self::check_version(true); |
|
| 2200 | + } elseif ($result['value'] == '14') { |
|
| 2201 | + $error = self::update_from_14(); |
|
| 2202 | + if ($error != '') return $error; |
|
| 2203 | + else return self::check_version(true); |
|
| 2204 | + } elseif ($result['value'] == '15') { |
|
| 2205 | + $error = self::update_from_15(); |
|
| 2206 | + if ($error != '') return $error; |
|
| 2207 | + else return self::check_version(true); |
|
| 2208 | + } elseif ($result['value'] == '16') { |
|
| 2209 | + $error = self::update_from_16(); |
|
| 2210 | + if ($error != '') return $error; |
|
| 2211 | + else return self::check_version(true); |
|
| 2212 | + } elseif ($result['value'] == '17') { |
|
| 2213 | + $error = self::update_from_17(); |
|
| 2214 | + if ($error != '') return $error; |
|
| 2215 | + else return self::check_version(true); |
|
| 2216 | + } elseif ($result['value'] == '18') { |
|
| 2217 | + $error = self::update_from_18(); |
|
| 2218 | + if ($error != '') return $error; |
|
| 2219 | + else return self::check_version(true); |
|
| 2220 | + } elseif ($result['value'] == '19') { |
|
| 2221 | + $error = self::update_from_19(); |
|
| 2222 | + if ($error != '') return $error; |
|
| 2223 | + else return self::check_version(true); |
|
| 2224 | + } elseif ($result['value'] == '20') { |
|
| 2225 | + $error = self::update_from_20(); |
|
| 2226 | + if ($error != '') return $error; |
|
| 2227 | + else return self::check_version(true); |
|
| 2228 | + } elseif ($result['value'] == '21') { |
|
| 2229 | + $error = self::update_from_21(); |
|
| 2230 | + if ($error != '') return $error; |
|
| 2231 | + else return self::check_version(true); |
|
| 2232 | + } elseif ($result['value'] == '22') { |
|
| 2233 | + $error = self::update_from_22(); |
|
| 2234 | + if ($error != '') return $error; |
|
| 2235 | + else return self::check_version(true); |
|
| 2236 | + } elseif ($result['value'] == '23') { |
|
| 2237 | + $error = self::update_from_23(); |
|
| 2238 | + if ($error != '') return $error; |
|
| 2239 | + else return self::check_version(true); |
|
| 2240 | + } elseif ($result['value'] == '24') { |
|
| 2241 | + $error = self::update_from_24(); |
|
| 2242 | + if ($error != '') return $error; |
|
| 2243 | + else return self::check_version(true); |
|
| 2244 | + } elseif ($result['value'] == '25') { |
|
| 2245 | + $error = self::update_from_25(); |
|
| 2246 | + if ($error != '') return $error; |
|
| 2247 | + else return self::check_version(true); |
|
| 2248 | + } elseif ($result['value'] == '26') { |
|
| 2249 | + $error = self::update_from_26(); |
|
| 2250 | + if ($error != '') return $error; |
|
| 2251 | + else return self::check_version(true); |
|
| 2252 | + } elseif ($result['value'] == '27') { |
|
| 2253 | + $error = self::update_from_27(); |
|
| 2254 | + if ($error != '') return $error; |
|
| 2255 | + else return self::check_version(true); |
|
| 2256 | + } elseif ($result['value'] == '28') { |
|
| 2257 | + $error = self::update_from_28(); |
|
| 2258 | + if ($error != '') return $error; |
|
| 2259 | + else return self::check_version(true); |
|
| 2260 | + } elseif ($result['value'] == '29') { |
|
| 2261 | + $error = self::update_from_29(); |
|
| 2262 | + if ($error != '') return $error; |
|
| 2263 | + else return self::check_version(true); |
|
| 2264 | + } elseif ($result['value'] == '30') { |
|
| 2265 | + $error = self::update_from_30(); |
|
| 2266 | + if ($error != '') return $error; |
|
| 2267 | + else return self::check_version(true); |
|
| 2268 | + } elseif ($result['value'] == '31') { |
|
| 2269 | + $error = self::update_from_31(); |
|
| 2270 | + if ($error != '') return $error; |
|
| 2271 | + else return self::check_version(true); |
|
| 2272 | + } elseif ($result['value'] == '32') { |
|
| 2273 | + $error = self::update_from_32(); |
|
| 2274 | + if ($error != '') return $error; |
|
| 2275 | + else return self::check_version(true); |
|
| 2276 | + } elseif ($result['value'] == '33') { |
|
| 2277 | + $error = self::update_from_33(); |
|
| 2278 | + if ($error != '') return $error; |
|
| 2279 | + else return self::check_version(true); |
|
| 2280 | + } elseif ($result['value'] == '34') { |
|
| 2281 | + $error = self::update_from_34(); |
|
| 2282 | + if ($error != '') return $error; |
|
| 2283 | + else return self::check_version(true); |
|
| 2284 | + } elseif ($result['value'] == '35') { |
|
| 2285 | + $error = self::update_from_35(); |
|
| 2286 | + if ($error != '') return $error; |
|
| 2287 | + else return self::check_version(true); |
|
| 2288 | + } elseif ($result['value'] == '36') { |
|
| 2289 | + $error = self::update_from_36(); |
|
| 2290 | + if ($error != '') return $error; |
|
| 2291 | + else return self::check_version(true); |
|
| 2292 | + } elseif ($result['value'] == '37') { |
|
| 2293 | + $error = self::update_from_37(); |
|
| 2294 | + if ($error != '') return $error; |
|
| 2295 | + else return self::check_version(true); |
|
| 2296 | + } elseif ($result['value'] == '38') { |
|
| 2297 | + $error = self::update_from_38(); |
|
| 2298 | + if ($error != '') return $error; |
|
| 2299 | + else return self::check_version(true); |
|
| 2300 | + } elseif ($result['value'] == '39') { |
|
| 2301 | + $error = self::update_from_39(); |
|
| 2302 | + if ($error != '') return $error; |
|
| 2303 | + else return self::check_version(true); |
|
| 2304 | + } elseif ($result['value'] == '40') { |
|
| 2305 | + $error = self::update_from_40(); |
|
| 2306 | + if ($error != '') return $error; |
|
| 2307 | + else return self::check_version(true); |
|
| 2308 | + } elseif ($result['value'] == '41') { |
|
| 2309 | + $error = self::update_from_41(); |
|
| 2310 | + if ($error != '') return $error; |
|
| 2311 | + else return self::check_version(true); |
|
| 2312 | + } elseif ($result['value'] == '42') { |
|
| 2313 | + $error = self::update_from_42(); |
|
| 2314 | + if ($error != '') return $error; |
|
| 2315 | + else return self::check_version(true); |
|
| 2316 | + } elseif ($result['value'] == '43') { |
|
| 2317 | + $error = self::update_from_43(); |
|
| 2318 | + if ($error != '') return $error; |
|
| 2319 | + else return self::check_version(true); |
|
| 2320 | + } elseif ($result['value'] == '44') { |
|
| 2321 | + $error = self::update_from_44(); |
|
| 2322 | + if ($error != '') return $error; |
|
| 2323 | + else return self::check_version(true); |
|
| 2324 | + } else return ''; |
|
| 2325 | + } |
|
| 2326 | + else return $result['value']; |
|
| 2327 | 2327 | } |
| 2328 | 2328 | |
| 2329 | - } else return $version; |
|
| 2330 | - } |
|
| 2329 | + } else return $version; |
|
| 2330 | + } |
|
| 2331 | 2331 | |
| 2332 | 2332 | } |
| 2333 | 2333 | //echo update_schema::check_version(); |
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | try { |
| 15 | 15 | $sth = $Connection->db->prepare($query); |
| 16 | 16 | $sth->execute(); |
| 17 | - } catch(PDOException $e) { |
|
| 17 | + } catch (PDOException $e) { |
|
| 18 | 18 | return "error : ".$e->getMessage()."\n"; |
| 19 | 19 | } |
| 20 | 20 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 21 | - $Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']); |
|
| 21 | + $Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | try { |
| 51 | 51 | $sth = $Connection->db->prepare($query); |
| 52 | 52 | $sth->execute(); |
| 53 | - } catch(PDOException $e) { |
|
| 53 | + } catch (PDOException $e) { |
|
| 54 | 54 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 55 | 55 | } |
| 56 | 56 | // Copy schedules data to routes table |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | try { |
| 61 | 61 | $sth = $Connection->db->prepare($query); |
| 62 | 62 | $sth->execute(); |
| 63 | - } catch(PDOException $e) { |
|
| 63 | + } catch (PDOException $e) { |
|
| 64 | 64 | return "error (delete schedule table) : ".$e->getMessage()."\n"; |
| 65 | 65 | } |
| 66 | 66 | // Add source column |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | try { |
| 69 | 69 | $sth = $Connection->db->prepare($query); |
| 70 | 70 | $sth->execute(); |
| 71 | - } catch(PDOException $e) { |
|
| 71 | + } catch (PDOException $e) { |
|
| 72 | 72 | return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
| 73 | 73 | } |
| 74 | 74 | // Delete unused column |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | try { |
| 77 | 77 | $sth = $Connection->db->prepare($query); |
| 78 | 78 | $sth->execute(); |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
| 81 | 81 | } |
| 82 | 82 | // Add ModeS column |
@@ -84,14 +84,14 @@ discard block |
||
| 84 | 84 | try { |
| 85 | 85 | $sth = $Connection->db->prepare($query); |
| 86 | 86 | $sth->execute(); |
| 87 | - } catch(PDOException $e) { |
|
| 87 | + } catch (PDOException $e) { |
|
| 88 | 88 | return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
| 89 | 89 | } |
| 90 | 90 | $query = "ALTER TABLE `spotter_live` ADD `ModeS` VARCHAR(255)"; |
| 91 | 91 | try { |
| 92 | 92 | $sth = $Connection->db->prepare($query); |
| 93 | 93 | $sth->execute(); |
| 94 | - } catch(PDOException $e) { |
|
| 94 | + } catch (PDOException $e) { |
|
| 95 | 95 | return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
| 96 | 96 | } |
| 97 | 97 | // Add auto_increment for aircraft_modes |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | try { |
| 100 | 100 | $sth = $Connection->db->prepare($query); |
| 101 | 101 | $sth->execute(); |
| 102 | - } catch(PDOException $e) { |
|
| 102 | + } catch (PDOException $e) { |
|
| 103 | 103 | return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
| 104 | 104 | } |
| 105 | 105 | $error = ''; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | try { |
| 111 | 111 | $sth = $Connection->db->prepare($query); |
| 112 | 112 | $sth->execute(); |
| 113 | - } catch(PDOException $e) { |
|
| 113 | + } catch (PDOException $e) { |
|
| 114 | 114 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 115 | 115 | } |
| 116 | 116 | return $error; |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | try { |
| 124 | 124 | $sth = $Connection->db->prepare($query); |
| 125 | 125 | $sth->execute(); |
| 126 | - } catch(PDOException $e) { |
|
| 126 | + } catch (PDOException $e) { |
|
| 127 | 127 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 128 | 128 | } |
| 129 | 129 | $error = ''; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | try { |
| 135 | 135 | $sth = $Connection->db->prepare($query); |
| 136 | 136 | $sth->execute(); |
| 137 | - } catch(PDOException $e) { |
|
| 137 | + } catch (PDOException $e) { |
|
| 138 | 138 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 139 | 139 | } |
| 140 | 140 | return $error; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | try { |
| 148 | 148 | $sth = $Connection->db->prepare($query); |
| 149 | 149 | $sth->execute(); |
| 150 | - } catch(PDOException $e) { |
|
| 150 | + } catch (PDOException $e) { |
|
| 151 | 151 | return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
| 152 | 152 | } |
| 153 | 153 | // Add image_source_website column to spotter_image |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | try { |
| 156 | 156 | $sth = $Connection->db->prepare($query); |
| 157 | 157 | $sth->execute(); |
| 158 | - } catch(PDOException $e) { |
|
| 158 | + } catch (PDOException $e) { |
|
| 159 | 159 | return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
| 160 | 160 | } |
| 161 | 161 | $error = ''; |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | try { |
| 165 | 165 | $sth = $Connection->db->prepare($query); |
| 166 | 166 | $sth->execute(); |
| 167 | - } catch(PDOException $e) { |
|
| 167 | + } catch (PDOException $e) { |
|
| 168 | 168 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 169 | 169 | } |
| 170 | 170 | return $error; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | try { |
| 183 | 183 | $sth = $Connection->db->prepare($query); |
| 184 | 184 | $sth->execute(); |
| 185 | - } catch(PDOException $e) { |
|
| 185 | + } catch (PDOException $e) { |
|
| 186 | 186 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 187 | 187 | } |
| 188 | 188 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | try { |
| 197 | 197 | $sth = $Connection->db->prepare($query); |
| 198 | 198 | $sth->execute(); |
| 199 | - } catch(PDOException $e) { |
|
| 199 | + } catch (PDOException $e) { |
|
| 200 | 200 | return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
| 201 | 201 | } |
| 202 | 202 | // Add aircraft_shadow column to aircraft |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | try { |
| 205 | 205 | $sth = $Connection->db->prepare($query); |
| 206 | 206 | $sth->execute(); |
| 207 | - } catch(PDOException $e) { |
|
| 207 | + } catch (PDOException $e) { |
|
| 208 | 208 | return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
| 209 | 209 | } |
| 210 | 210 | // Add aircraft_shadow column to spotter_live |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | try { |
| 213 | 213 | $sth = $Connection->db->prepare($query); |
| 214 | 214 | $sth->execute(); |
| 215 | - } catch(PDOException $e) { |
|
| 215 | + } catch (PDOException $e) { |
|
| 216 | 216 | return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
| 217 | 217 | } |
| 218 | 218 | $error = ''; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | try { |
| 226 | 226 | $sth = $Connection->db->prepare($query); |
| 227 | 227 | $sth->execute(); |
| 228 | - } catch(PDOException $e) { |
|
| 228 | + } catch (PDOException $e) { |
|
| 229 | 229 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 230 | 230 | } |
| 231 | 231 | return $error; |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | |
| 234 | 234 | private static function update_from_6() { |
| 235 | 235 | $Connection = new Connection(); |
| 236 | - if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 236 | + if (!$Connection->indexExists('spotter_output', 'flightaware_id')) { |
|
| 237 | 237 | $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id); |
| 238 | 238 | ALTER TABLE spotter_output ADD INDEX(date); |
| 239 | 239 | ALTER TABLE spotter_output ADD INDEX(ident); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | try { |
| 251 | 251 | $sth = $Connection->db->prepare($query); |
| 252 | 252 | $sth->execute(); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch (PDOException $e) { |
|
| 254 | 254 | return "error (add some indexes) : ".$e->getMessage()."\n"; |
| 255 | 255 | } |
| 256 | 256 | } |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | try { |
| 266 | 266 | $sth = $Connection->db->prepare($query); |
| 267 | 267 | $sth->execute(); |
| 268 | - } catch(PDOException $e) { |
|
| 268 | + } catch (PDOException $e) { |
|
| 269 | 269 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 270 | 270 | } |
| 271 | 271 | return $error; |
@@ -274,12 +274,12 @@ discard block |
||
| 274 | 274 | private static function update_from_7() { |
| 275 | 275 | global $globalDBname, $globalDBdriver; |
| 276 | 276 | $Connection = new Connection(); |
| 277 | - $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 277 | + $query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 278 | 278 | ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;"; |
| 279 | 279 | try { |
| 280 | 280 | $sth = $Connection->db->prepare($query); |
| 281 | 281 | $sth->execute(); |
| 282 | - } catch(PDOException $e) { |
|
| 282 | + } catch (PDOException $e) { |
|
| 283 | 283 | return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 284 | 284 | } |
| 285 | 285 | if ($globalDBdriver == 'mysql') { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | try { |
| 288 | 288 | $sth = $Connection->db->prepare($query); |
| 289 | 289 | $sth->execute(); |
| 290 | - } catch(PDOException $e) { |
|
| 290 | + } catch (PDOException $e) { |
|
| 291 | 291 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 292 | 292 | } |
| 293 | 293 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -299,15 +299,15 @@ discard block |
||
| 299 | 299 | DROP TABLE spotter_archive; |
| 300 | 300 | RENAME TABLE copy TO spotter_archive;"; |
| 301 | 301 | } else { |
| 302 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 302 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | 303 | } |
| 304 | 304 | } else { |
| 305 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 305 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | 306 | } |
| 307 | 307 | try { |
| 308 | 308 | $sth = $Connection->db->prepare($query); |
| 309 | 309 | $sth->execute(); |
| 310 | - } catch(PDOException $e) { |
|
| 310 | + } catch (PDOException $e) { |
|
| 311 | 311 | return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
| 312 | 312 | } |
| 313 | 313 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | try { |
| 321 | 321 | $sth = $Connection->db->prepare($query); |
| 322 | 322 | $sth->execute(); |
| 323 | - } catch(PDOException $e) { |
|
| 323 | + } catch (PDOException $e) { |
|
| 324 | 324 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 325 | 325 | } |
| 326 | 326 | return $error; |
@@ -339,14 +339,14 @@ discard block |
||
| 339 | 339 | try { |
| 340 | 340 | $sth = $Connection->db->prepare($query); |
| 341 | 341 | $sth->execute(); |
| 342 | - } catch(PDOException $e) { |
|
| 342 | + } catch (PDOException $e) { |
|
| 343 | 343 | return "error (insert last_update values) : ".$e->getMessage()."\n"; |
| 344 | 344 | } |
| 345 | 345 | $query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'"; |
| 346 | 346 | try { |
| 347 | 347 | $sth = $Connection->db->prepare($query); |
| 348 | 348 | $sth->execute(); |
| 349 | - } catch(PDOException $e) { |
|
| 349 | + } catch (PDOException $e) { |
|
| 350 | 350 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 351 | 351 | } |
| 352 | 352 | return $error; |
@@ -354,12 +354,12 @@ discard block |
||
| 354 | 354 | |
| 355 | 355 | private static function update_from_9() { |
| 356 | 356 | $Connection = new Connection(); |
| 357 | - $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 357 | + $query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 358 | 358 | ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;"; |
| 359 | 359 | try { |
| 360 | 360 | $sth = $Connection->db->prepare($query); |
| 361 | 361 | $sth->execute(); |
| 362 | - } catch(PDOException $e) { |
|
| 362 | + } catch (PDOException $e) { |
|
| 363 | 363 | return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 364 | 364 | } |
| 365 | 365 | $error = ''; |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | try { |
| 372 | 372 | $sth = $Connection->db->prepare($query); |
| 373 | 373 | $sth->execute(); |
| 374 | - } catch(PDOException $e) { |
|
| 374 | + } catch (PDOException $e) { |
|
| 375 | 375 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 376 | 376 | } |
| 377 | 377 | return $error; |
@@ -379,11 +379,11 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | private static function update_from_10() { |
| 381 | 381 | $Connection = new Connection(); |
| 382 | - $query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 382 | + $query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 383 | 383 | try { |
| 384 | 384 | $sth = $Connection->db->prepare($query); |
| 385 | 385 | $sth->execute(); |
| 386 | - } catch(PDOException $e) { |
|
| 386 | + } catch (PDOException $e) { |
|
| 387 | 387 | return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
| 388 | 388 | } |
| 389 | 389 | $error = ''; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | try { |
| 402 | 402 | $sth = $Connection->db->prepare($query); |
| 403 | 403 | $sth->execute(); |
| 404 | - } catch(PDOException $e) { |
|
| 404 | + } catch (PDOException $e) { |
|
| 405 | 405 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 406 | 406 | } |
| 407 | 407 | return $error; |
@@ -410,18 +410,18 @@ discard block |
||
| 410 | 410 | private static function update_from_11() { |
| 411 | 411 | global $globalDBdriver, $globalDBname; |
| 412 | 412 | $Connection = new Connection(); |
| 413 | - $query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 413 | + $query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 414 | 414 | try { |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | 416 | $sth->execute(); |
| 417 | - } catch(PDOException $e) { |
|
| 417 | + } catch (PDOException $e) { |
|
| 418 | 418 | return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
| 419 | 419 | } |
| 420 | - $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 420 | + $query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | 421 | try { |
| 422 | 422 | $sth = $Connection->db->prepare($query); |
| 423 | 423 | $sth->execute(); |
| 424 | - } catch(PDOException $e) { |
|
| 424 | + } catch (PDOException $e) { |
|
| 425 | 425 | return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
| 426 | 426 | } |
| 427 | 427 | if ($globalDBdriver == 'mysql') { |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | try { |
| 430 | 430 | $sth = $Connection->db->prepare($query); |
| 431 | 431 | $sth->execute(); |
| 432 | - } catch(PDOException $e) { |
|
| 432 | + } catch (PDOException $e) { |
|
| 433 | 433 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 434 | 434 | } |
| 435 | 435 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -441,15 +441,15 @@ discard block |
||
| 441 | 441 | DROP TABLE spotter_archive; |
| 442 | 442 | RENAME TABLE copy TO spotter_archive;"; |
| 443 | 443 | } else { |
| 444 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 444 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 445 | 445 | } |
| 446 | 446 | } else { |
| 447 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 447 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 448 | 448 | } |
| 449 | 449 | try { |
| 450 | 450 | $sth = $Connection->db->prepare($query); |
| 451 | 451 | $sth->execute(); |
| 452 | - } catch(PDOException $e) { |
|
| 452 | + } catch (PDOException $e) { |
|
| 453 | 453 | return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
| 454 | 454 | } |
| 455 | 455 | |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | try { |
| 460 | 460 | $sth = $Connection->db->prepare($query); |
| 461 | 461 | $sth->execute(); |
| 462 | - } catch(PDOException $e) { |
|
| 462 | + } catch (PDOException $e) { |
|
| 463 | 463 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 464 | 464 | } |
| 465 | 465 | return $error; |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | try { |
| 488 | 488 | $sth = $Connection->db->prepare($query); |
| 489 | 489 | $sth->execute(); |
| 490 | - } catch(PDOException $e) { |
|
| 490 | + } catch (PDOException $e) { |
|
| 491 | 491 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 492 | 492 | } |
| 493 | 493 | return $error; |
@@ -495,12 +495,12 @@ discard block |
||
| 495 | 495 | |
| 496 | 496 | private static function update_from_13() { |
| 497 | 497 | $Connection = new Connection(); |
| 498 | - if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) { |
|
| 499 | - $query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 498 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) { |
|
| 499 | + $query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 500 | 500 | try { |
| 501 | 501 | $sth = $Connection->db->prepare($query); |
| 502 | 502 | $sth->execute(); |
| 503 | - } catch(PDOException $e) { |
|
| 503 | + } catch (PDOException $e) { |
|
| 504 | 504 | return "error (update spotter_archive_output) : ".$e->getMessage()."\n"; |
| 505 | 505 | } |
| 506 | 506 | } |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | try { |
| 510 | 510 | $sth = $Connection->db->prepare($query); |
| 511 | 511 | $sth->execute(); |
| 512 | - } catch(PDOException $e) { |
|
| 512 | + } catch (PDOException $e) { |
|
| 513 | 513 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 514 | 514 | } |
| 515 | 515 | return $error; |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | try { |
| 528 | 528 | $sth = $Connection->db->prepare($query); |
| 529 | 529 | $sth->execute(); |
| 530 | - } catch(PDOException $e) { |
|
| 530 | + } catch (PDOException $e) { |
|
| 531 | 531 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 532 | 532 | } |
| 533 | 533 | return $error; |
@@ -538,11 +538,11 @@ discard block |
||
| 538 | 538 | $Connection = new Connection(); |
| 539 | 539 | $error = ''; |
| 540 | 540 | // Add tables |
| 541 | - $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 541 | + $query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | 542 | try { |
| 543 | 543 | $sth = $Connection->db->prepare($query); |
| 544 | 544 | $sth->execute(); |
| 545 | - } catch(PDOException $e) { |
|
| 545 | + } catch (PDOException $e) { |
|
| 546 | 546 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 547 | } |
| 548 | 548 | if ($error != '') return $error; |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | try { |
| 551 | 551 | $sth = $Connection->db->prepare($query); |
| 552 | 552 | $sth->execute(); |
| 553 | - } catch(PDOException $e) { |
|
| 553 | + } catch (PDOException $e) { |
|
| 554 | 554 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 555 | 555 | } |
| 556 | 556 | return $error; |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | try { |
| 572 | 572 | $sth = $Connection->db->prepare($query); |
| 573 | 573 | $sth->execute(); |
| 574 | - } catch(PDOException $e) { |
|
| 574 | + } catch (PDOException $e) { |
|
| 575 | 575 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 576 | 576 | } |
| 577 | 577 | return $error; |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | try { |
| 590 | 590 | $sth = $Connection->db->prepare($query); |
| 591 | 591 | $sth->execute(); |
| 592 | - } catch(PDOException $e) { |
|
| 592 | + } catch (PDOException $e) { |
|
| 593 | 593 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 594 | 594 | } |
| 595 | 595 | return $error; |
@@ -598,12 +598,12 @@ discard block |
||
| 598 | 598 | $Connection = new Connection(); |
| 599 | 599 | $error = ''; |
| 600 | 600 | // Modify stats_airport table |
| 601 | - if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 601 | + if (!$Connection->checkColumnName('stats_airport', 'airport_name')) { |
|
| 602 | 602 | $query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)"; |
| 603 | 603 | try { |
| 604 | 604 | $sth = $Connection->db->prepare($query); |
| 605 | 605 | $sth->execute(); |
| 606 | - } catch(PDOException $e) { |
|
| 606 | + } catch (PDOException $e) { |
|
| 607 | 607 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 608 | } |
| 609 | 609 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | try { |
| 613 | 613 | $sth = $Connection->db->prepare($query); |
| 614 | 614 | $sth->execute(); |
| 615 | - } catch(PDOException $e) { |
|
| 615 | + } catch (PDOException $e) { |
|
| 616 | 616 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 617 | 617 | } |
| 618 | 618 | return $error; |
@@ -629,73 +629,73 @@ discard block |
||
| 629 | 629 | try { |
| 630 | 630 | $sth = $Connection->db->prepare($query); |
| 631 | 631 | $sth->execute(); |
| 632 | - } catch(PDOException $e) { |
|
| 632 | + } catch (PDOException $e) { |
|
| 633 | 633 | return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
| 634 | 634 | } |
| 635 | 635 | $query = "alter table spotter_archive add spotter_archive_id INT(11)"; |
| 636 | 636 | try { |
| 637 | 637 | $sth = $Connection->db->prepare($query); |
| 638 | 638 | $sth->execute(); |
| 639 | - } catch(PDOException $e) { |
|
| 639 | + } catch (PDOException $e) { |
|
| 640 | 640 | return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
| 641 | 641 | } |
| 642 | - if (!$Connection->checkColumnName('spotter_archive','over_country')) { |
|
| 642 | + if (!$Connection->checkColumnName('spotter_archive', 'over_country')) { |
|
| 643 | 643 | // Add column over_country |
| 644 | 644 | $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 645 | 645 | try { |
| 646 | 646 | $sth = $Connection->db->prepare($query); |
| 647 | 647 | $sth->execute(); |
| 648 | - } catch(PDOException $e) { |
|
| 648 | + } catch (PDOException $e) { |
|
| 649 | 649 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 650 | 650 | } |
| 651 | 651 | } |
| 652 | - if (!$Connection->checkColumnName('spotter_live','over_country')) { |
|
| 652 | + if (!$Connection->checkColumnName('spotter_live', 'over_country')) { |
|
| 653 | 653 | // Add column over_country |
| 654 | 654 | $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 655 | 655 | try { |
| 656 | 656 | $sth = $Connection->db->prepare($query); |
| 657 | 657 | $sth->execute(); |
| 658 | - } catch(PDOException $e) { |
|
| 658 | + } catch (PDOException $e) { |
|
| 659 | 659 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | - if (!$Connection->checkColumnName('spotter_output','source_name')) { |
|
| 662 | + if (!$Connection->checkColumnName('spotter_output', 'source_name')) { |
|
| 663 | 663 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 664 | 664 | $query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 665 | 665 | try { |
| 666 | 666 | $sth = $Connection->db->prepare($query); |
| 667 | 667 | $sth->execute(); |
| 668 | - } catch(PDOException $e) { |
|
| 668 | + } catch (PDOException $e) { |
|
| 669 | 669 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 670 | 670 | } |
| 671 | 671 | } |
| 672 | - if (!$Connection->checkColumnName('spotter_live','source_name')) { |
|
| 672 | + if (!$Connection->checkColumnName('spotter_live', 'source_name')) { |
|
| 673 | 673 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 674 | 674 | $query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 675 | 675 | try { |
| 676 | 676 | $sth = $Connection->db->prepare($query); |
| 677 | 677 | $sth->execute(); |
| 678 | - } catch(PDOException $e) { |
|
| 678 | + } catch (PDOException $e) { |
|
| 679 | 679 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | - if (!$Connection->checkColumnName('spotter_archive_output','source_name')) { |
|
| 682 | + if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) { |
|
| 683 | 683 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 684 | 684 | $query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 685 | 685 | try { |
| 686 | 686 | $sth = $Connection->db->prepare($query); |
| 687 | 687 | $sth->execute(); |
| 688 | - } catch(PDOException $e) { |
|
| 688 | + } catch (PDOException $e) { |
|
| 689 | 689 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 690 | 690 | } |
| 691 | 691 | } |
| 692 | - if (!$Connection->checkColumnName('spotter_archive','source_name')) { |
|
| 692 | + if (!$Connection->checkColumnName('spotter_archive', 'source_name')) { |
|
| 693 | 693 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 694 | 694 | $query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;"; |
| 695 | 695 | try { |
| 696 | 696 | $sth = $Connection->db->prepare($query); |
| 697 | 697 | $sth->execute(); |
| 698 | - } catch(PDOException $e) { |
|
| 698 | + } catch (PDOException $e) { |
|
| 699 | 699 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 700 | } |
| 701 | 701 | } |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | try { |
| 705 | 705 | $sth = $Connection->db->prepare($query); |
| 706 | 706 | $sth->execute(); |
| 707 | - } catch(PDOException $e) { |
|
| 707 | + } catch (PDOException $e) { |
|
| 708 | 708 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 709 | 709 | } |
| 710 | 710 | return $error; |
@@ -719,13 +719,13 @@ discard block |
||
| 719 | 719 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | 720 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 721 | 721 | } |
| 722 | - if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
|
| 722 | + if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) { |
|
| 723 | 723 | // Add column over_country |
| 724 | 724 | $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
| 725 | 725 | try { |
| 726 | 726 | $sth = $Connection->db->prepare($query); |
| 727 | 727 | $sth->execute(); |
| 728 | - } catch(PDOException $e) { |
|
| 728 | + } catch (PDOException $e) { |
|
| 729 | 729 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 730 | } |
| 731 | 731 | } |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | try { |
| 742 | 742 | $sth = $Connection->db->prepare($query); |
| 743 | 743 | $sth->execute(); |
| 744 | - } catch(PDOException $e) { |
|
| 744 | + } catch (PDOException $e) { |
|
| 745 | 745 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 746 | 746 | } |
| 747 | 747 | return $error; |
@@ -750,13 +750,13 @@ discard block |
||
| 750 | 750 | private static function update_from_21() { |
| 751 | 751 | $Connection = new Connection(); |
| 752 | 752 | $error = ''; |
| 753 | - if (!$Connection->checkColumnName('stats_airport','stats_type')) { |
|
| 753 | + if (!$Connection->checkColumnName('stats_airport', 'stats_type')) { |
|
| 754 | 754 | // Rename type to stats_type |
| 755 | 755 | $query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);"; |
| 756 | 756 | try { |
| 757 | 757 | $sth = $Connection->db->prepare($query); |
| 758 | 758 | $sth->execute(); |
| 759 | - } catch(PDOException $e) { |
|
| 759 | + } catch (PDOException $e) { |
|
| 760 | 760 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 761 | } |
| 762 | 762 | if ($error != '') return $error; |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | try { |
| 766 | 766 | $sth = $Connection->db->prepare($query); |
| 767 | 767 | $sth->execute(); |
| 768 | - } catch(PDOException $e) { |
|
| 768 | + } catch (PDOException $e) { |
|
| 769 | 769 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 770 | 770 | } |
| 771 | 771 | return $error; |
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | try { |
| 789 | 789 | $sth = $Connection->db->prepare($query); |
| 790 | 790 | $sth->execute(); |
| 791 | - } catch(PDOException $e) { |
|
| 791 | + } catch (PDOException $e) { |
|
| 792 | 792 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 793 | 793 | } |
| 794 | 794 | return $error; |
@@ -815,17 +815,17 @@ discard block |
||
| 815 | 815 | try { |
| 816 | 816 | $sth = $Connection->db->prepare($query); |
| 817 | 817 | $sth->execute(); |
| 818 | - } catch(PDOException $e) { |
|
| 818 | + } catch (PDOException $e) { |
|
| 819 | 819 | return "error (create index on spotter_archive) : ".$e->getMessage()."\n"; |
| 820 | 820 | } |
| 821 | 821 | } |
| 822 | - if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
|
| 822 | + if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) { |
|
| 823 | 823 | // Add aircraft_manufacturer to stats_aircraft |
| 824 | 824 | $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
| 825 | 825 | try { |
| 826 | 826 | $sth = $Connection->db->prepare($query); |
| 827 | 827 | $sth->execute(); |
| 828 | - } catch(PDOException $e) { |
|
| 828 | + } catch (PDOException $e) { |
|
| 829 | 829 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 830 | 830 | } |
| 831 | 831 | } |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | try { |
| 835 | 835 | $sth = $Connection->db->prepare($query); |
| 836 | 836 | $sth->execute(); |
| 837 | - } catch(PDOException $e) { |
|
| 837 | + } catch (PDOException $e) { |
|
| 838 | 838 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 839 | 839 | } |
| 840 | 840 | return $error; |
@@ -850,23 +850,23 @@ discard block |
||
| 850 | 850 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 851 | 851 | } |
| 852 | 852 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 853 | - if (!$Connection->checkColumnName('airlines','forsource')) { |
|
| 853 | + if (!$Connection->checkColumnName('airlines', 'forsource')) { |
|
| 854 | 854 | // Add forsource to airlines |
| 855 | 855 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
| 856 | 856 | try { |
| 857 | 857 | $sth = $Connection->db->prepare($query); |
| 858 | 858 | $sth->execute(); |
| 859 | - } catch(PDOException $e) { |
|
| 859 | + } catch (PDOException $e) { |
|
| 860 | 860 | return "error (add forsource column) : ".$e->getMessage()."\n"; |
| 861 | 861 | } |
| 862 | 862 | } |
| 863 | - if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) { |
|
| 863 | + if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) { |
|
| 864 | 864 | // Add forsource to airlines |
| 865 | 865 | $query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 866 | 866 | try { |
| 867 | 867 | $sth = $Connection->db->prepare($query); |
| 868 | 868 | $sth->execute(); |
| 869 | - } catch(PDOException $e) { |
|
| 869 | + } catch (PDOException $e) { |
|
| 870 | 870 | return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n"; |
| 871 | 871 | } |
| 872 | 872 | // Add unique key |
@@ -878,17 +878,17 @@ discard block |
||
| 878 | 878 | try { |
| 879 | 879 | $sth = $Connection->db->prepare($query); |
| 880 | 880 | $sth->execute(); |
| 881 | - } catch(PDOException $e) { |
|
| 881 | + } catch (PDOException $e) { |
|
| 882 | 882 | return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n"; |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | - if (!$Connection->checkColumnName('stats_airport','stats_airline')) { |
|
| 885 | + if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) { |
|
| 886 | 886 | // Add forsource to airlines |
| 887 | 887 | $query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 888 | 888 | try { |
| 889 | 889 | $sth = $Connection->db->prepare($query); |
| 890 | 890 | $sth->execute(); |
| 891 | - } catch(PDOException $e) { |
|
| 891 | + } catch (PDOException $e) { |
|
| 892 | 892 | return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n"; |
| 893 | 893 | } |
| 894 | 894 | // Add unique key |
@@ -900,17 +900,17 @@ discard block |
||
| 900 | 900 | try { |
| 901 | 901 | $sth = $Connection->db->prepare($query); |
| 902 | 902 | $sth->execute(); |
| 903 | - } catch(PDOException $e) { |
|
| 903 | + } catch (PDOException $e) { |
|
| 904 | 904 | return "error (add unique key in stats_airport) : ".$e->getMessage()."\n"; |
| 905 | 905 | } |
| 906 | 906 | } |
| 907 | - if (!$Connection->checkColumnName('stats_country','stats_airline')) { |
|
| 907 | + if (!$Connection->checkColumnName('stats_country', 'stats_airline')) { |
|
| 908 | 908 | // Add forsource to airlines |
| 909 | 909 | $query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 910 | 910 | try { |
| 911 | 911 | $sth = $Connection->db->prepare($query); |
| 912 | 912 | $sth->execute(); |
| 913 | - } catch(PDOException $e) { |
|
| 913 | + } catch (PDOException $e) { |
|
| 914 | 914 | return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n"; |
| 915 | 915 | } |
| 916 | 916 | // Add unique key |
@@ -922,36 +922,36 @@ discard block |
||
| 922 | 922 | try { |
| 923 | 923 | $sth = $Connection->db->prepare($query); |
| 924 | 924 | $sth->execute(); |
| 925 | - } catch(PDOException $e) { |
|
| 925 | + } catch (PDOException $e) { |
|
| 926 | 926 | return "error (add unique key in stats_airline) : ".$e->getMessage()."\n"; |
| 927 | 927 | } |
| 928 | 928 | } |
| 929 | - if (!$Connection->checkColumnName('stats_flight','stats_airline')) { |
|
| 929 | + if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) { |
|
| 930 | 930 | // Add forsource to airlines |
| 931 | 931 | $query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 932 | 932 | try { |
| 933 | 933 | $sth = $Connection->db->prepare($query); |
| 934 | 934 | $sth->execute(); |
| 935 | - } catch(PDOException $e) { |
|
| 935 | + } catch (PDOException $e) { |
|
| 936 | 936 | return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n"; |
| 937 | 937 | } |
| 938 | 938 | } |
| 939 | - if (!$Connection->checkColumnName('stats','stats_airline')) { |
|
| 939 | + if (!$Connection->checkColumnName('stats', 'stats_airline')) { |
|
| 940 | 940 | // Add forsource to airlines |
| 941 | 941 | $query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 942 | 942 | try { |
| 943 | 943 | $sth = $Connection->db->prepare($query); |
| 944 | 944 | $sth->execute(); |
| 945 | - } catch(PDOException $e) { |
|
| 945 | + } catch (PDOException $e) { |
|
| 946 | 946 | return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n"; |
| 947 | 947 | } |
| 948 | - if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) { |
|
| 948 | + if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) { |
|
| 949 | 949 | // Add unique key |
| 950 | 950 | $query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);"; |
| 951 | 951 | try { |
| 952 | 952 | $sth = $Connection->db->prepare($query); |
| 953 | 953 | $sth->execute(); |
| 954 | - } catch(PDOException $e) { |
|
| 954 | + } catch (PDOException $e) { |
|
| 955 | 955 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 956 | 956 | } |
| 957 | 957 | } else { |
@@ -964,18 +964,18 @@ discard block |
||
| 964 | 964 | try { |
| 965 | 965 | $sth = $Connection->db->prepare($query); |
| 966 | 966 | $sth->execute(); |
| 967 | - } catch(PDOException $e) { |
|
| 967 | + } catch (PDOException $e) { |
|
| 968 | 968 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 969 | 969 | } |
| 970 | 970 | } |
| 971 | 971 | } |
| 972 | - if (!$Connection->checkColumnName('stats_registration','stats_airline')) { |
|
| 972 | + if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) { |
|
| 973 | 973 | // Add forsource to airlines |
| 974 | 974 | $query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 975 | 975 | try { |
| 976 | 976 | $sth = $Connection->db->prepare($query); |
| 977 | 977 | $sth->execute(); |
| 978 | - } catch(PDOException $e) { |
|
| 978 | + } catch (PDOException $e) { |
|
| 979 | 979 | return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n"; |
| 980 | 980 | } |
| 981 | 981 | // Add unique key |
@@ -987,17 +987,17 @@ discard block |
||
| 987 | 987 | try { |
| 988 | 988 | $sth = $Connection->db->prepare($query); |
| 989 | 989 | $sth->execute(); |
| 990 | - } catch(PDOException $e) { |
|
| 990 | + } catch (PDOException $e) { |
|
| 991 | 991 | return "error (add unique key in stats_registration) : ".$e->getMessage()."\n"; |
| 992 | 992 | } |
| 993 | 993 | } |
| 994 | - if (!$Connection->checkColumnName('stats_callsign','filter_name')) { |
|
| 994 | + if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) { |
|
| 995 | 995 | // Add forsource to airlines |
| 996 | 996 | $query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 997 | 997 | try { |
| 998 | 998 | $sth = $Connection->db->prepare($query); |
| 999 | 999 | $sth->execute(); |
| 1000 | - } catch(PDOException $e) { |
|
| 1000 | + } catch (PDOException $e) { |
|
| 1001 | 1001 | return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n"; |
| 1002 | 1002 | } |
| 1003 | 1003 | // Add unique key |
@@ -1009,17 +1009,17 @@ discard block |
||
| 1009 | 1009 | try { |
| 1010 | 1010 | $sth = $Connection->db->prepare($query); |
| 1011 | 1011 | $sth->execute(); |
| 1012 | - } catch(PDOException $e) { |
|
| 1012 | + } catch (PDOException $e) { |
|
| 1013 | 1013 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1014 | 1014 | } |
| 1015 | 1015 | } |
| 1016 | - if (!$Connection->checkColumnName('stats_airline','filter_name')) { |
|
| 1016 | + if (!$Connection->checkColumnName('stats_airline', 'filter_name')) { |
|
| 1017 | 1017 | // Add forsource to airlines |
| 1018 | 1018 | $query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1019 | 1019 | try { |
| 1020 | 1020 | $sth = $Connection->db->prepare($query); |
| 1021 | 1021 | $sth->execute(); |
| 1022 | - } catch(PDOException $e) { |
|
| 1022 | + } catch (PDOException $e) { |
|
| 1023 | 1023 | return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n"; |
| 1024 | 1024 | } |
| 1025 | 1025 | // Add unique key |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | try { |
| 1032 | 1032 | $sth = $Connection->db->prepare($query); |
| 1033 | 1033 | $sth->execute(); |
| 1034 | - } catch(PDOException $e) { |
|
| 1034 | + } catch (PDOException $e) { |
|
| 1035 | 1035 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1036 | 1036 | } |
| 1037 | 1037 | } |
@@ -1040,7 +1040,7 @@ discard block |
||
| 1040 | 1040 | try { |
| 1041 | 1041 | $sth = $Connection->db->prepare($query); |
| 1042 | 1042 | $sth->execute(); |
| 1043 | - } catch(PDOException $e) { |
|
| 1043 | + } catch (PDOException $e) { |
|
| 1044 | 1044 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1045 | 1045 | } |
| 1046 | 1046 | return $error; |
@@ -1050,13 +1050,13 @@ discard block |
||
| 1050 | 1050 | global $globalDBdriver; |
| 1051 | 1051 | $Connection = new Connection(); |
| 1052 | 1052 | $error = ''; |
| 1053 | - if (!$Connection->checkColumnName('stats_owner','stats_airline')) { |
|
| 1053 | + if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) { |
|
| 1054 | 1054 | // Add forsource to airlines |
| 1055 | 1055 | $query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1056 | 1056 | try { |
| 1057 | 1057 | $sth = $Connection->db->prepare($query); |
| 1058 | 1058 | $sth->execute(); |
| 1059 | - } catch(PDOException $e) { |
|
| 1059 | + } catch (PDOException $e) { |
|
| 1060 | 1060 | return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n"; |
| 1061 | 1061 | } |
| 1062 | 1062 | // Add unique key |
@@ -1068,17 +1068,17 @@ discard block |
||
| 1068 | 1068 | try { |
| 1069 | 1069 | $sth = $Connection->db->prepare($query); |
| 1070 | 1070 | $sth->execute(); |
| 1071 | - } catch(PDOException $e) { |
|
| 1071 | + } catch (PDOException $e) { |
|
| 1072 | 1072 | return "error (add unique key in stats_owner) : ".$e->getMessage()."\n"; |
| 1073 | 1073 | } |
| 1074 | 1074 | } |
| 1075 | - if (!$Connection->checkColumnName('stats_pilot','stats_airline')) { |
|
| 1075 | + if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) { |
|
| 1076 | 1076 | // Add forsource to airlines |
| 1077 | 1077 | $query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1078 | 1078 | try { |
| 1079 | 1079 | $sth = $Connection->db->prepare($query); |
| 1080 | 1080 | $sth->execute(); |
| 1081 | - } catch(PDOException $e) { |
|
| 1081 | + } catch (PDOException $e) { |
|
| 1082 | 1082 | return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1083 | 1083 | } |
| 1084 | 1084 | // Add unique key |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | try { |
| 1091 | 1091 | $sth = $Connection->db->prepare($query); |
| 1092 | 1092 | $sth->execute(); |
| 1093 | - } catch(PDOException $e) { |
|
| 1093 | + } catch (PDOException $e) { |
|
| 1094 | 1094 | return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1095 | 1095 | } |
| 1096 | 1096 | } |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | try { |
| 1099 | 1099 | $sth = $Connection->db->prepare($query); |
| 1100 | 1100 | $sth->execute(); |
| 1101 | - } catch(PDOException $e) { |
|
| 1101 | + } catch (PDOException $e) { |
|
| 1102 | 1102 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1103 | 1103 | } |
| 1104 | 1104 | return $error; |
@@ -1108,12 +1108,12 @@ discard block |
||
| 1108 | 1108 | global $globalDBdriver; |
| 1109 | 1109 | $Connection = new Connection(); |
| 1110 | 1110 | $error = ''; |
| 1111 | - if (!$Connection->checkColumnName('atc','format_source')) { |
|
| 1111 | + if (!$Connection->checkColumnName('atc', 'format_source')) { |
|
| 1112 | 1112 | $query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL"; |
| 1113 | 1113 | try { |
| 1114 | 1114 | $sth = $Connection->db->prepare($query); |
| 1115 | 1115 | $sth->execute(); |
| 1116 | - } catch(PDOException $e) { |
|
| 1116 | + } catch (PDOException $e) { |
|
| 1117 | 1117 | return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n"; |
| 1118 | 1118 | } |
| 1119 | 1119 | } |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | try { |
| 1122 | 1122 | $sth = $Connection->db->prepare($query); |
| 1123 | 1123 | $sth->execute(); |
| 1124 | - } catch(PDOException $e) { |
|
| 1124 | + } catch (PDOException $e) { |
|
| 1125 | 1125 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1126 | 1126 | } |
| 1127 | 1127 | return $error; |
@@ -1131,13 +1131,13 @@ discard block |
||
| 1131 | 1131 | global $globalDBdriver; |
| 1132 | 1132 | $Connection = new Connection(); |
| 1133 | 1133 | $error = ''; |
| 1134 | - if (!$Connection->checkColumnName('stats_pilot','format_source')) { |
|
| 1134 | + if (!$Connection->checkColumnName('stats_pilot', 'format_source')) { |
|
| 1135 | 1135 | // Add forsource to airlines |
| 1136 | 1136 | $query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''"; |
| 1137 | 1137 | try { |
| 1138 | 1138 | $sth = $Connection->db->prepare($query); |
| 1139 | 1139 | $sth->execute(); |
| 1140 | - } catch(PDOException $e) { |
|
| 1140 | + } catch (PDOException $e) { |
|
| 1141 | 1141 | return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1142 | 1142 | } |
| 1143 | 1143 | // Add unique key |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | try { |
| 1150 | 1150 | $sth = $Connection->db->prepare($query); |
| 1151 | 1151 | $sth->execute(); |
| 1152 | - } catch(PDOException $e) { |
|
| 1152 | + } catch (PDOException $e) { |
|
| 1153 | 1153 | return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1154 | 1154 | } |
| 1155 | 1155 | } |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | try { |
| 1158 | 1158 | $sth = $Connection->db->prepare($query); |
| 1159 | 1159 | $sth->execute(); |
| 1160 | - } catch(PDOException $e) { |
|
| 1160 | + } catch (PDOException $e) { |
|
| 1161 | 1161 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1162 | 1162 | } |
| 1163 | 1163 | return $error; |
@@ -1167,23 +1167,23 @@ discard block |
||
| 1167 | 1167 | global $globalDBdriver; |
| 1168 | 1168 | $Connection = new Connection(); |
| 1169 | 1169 | $error = ''; |
| 1170 | - if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) { |
|
| 1170 | + if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) { |
|
| 1171 | 1171 | // Add unique key |
| 1172 | 1172 | $query = "alter table spotter_live add index(latitude,longitude)"; |
| 1173 | 1173 | try { |
| 1174 | 1174 | $sth = $Connection->db->prepare($query); |
| 1175 | 1175 | $sth->execute(); |
| 1176 | - } catch(PDOException $e) { |
|
| 1176 | + } catch (PDOException $e) { |
|
| 1177 | 1177 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1178 | 1178 | } |
| 1179 | 1179 | } |
| 1180 | - if (!$Connection->checkColumnName('aircraft','mfr')) { |
|
| 1180 | + if (!$Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1181 | 1181 | // Add mfr to aircraft |
| 1182 | 1182 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
| 1183 | 1183 | try { |
| 1184 | 1184 | $sth = $Connection->db->prepare($query); |
| 1185 | 1185 | $sth->execute(); |
| 1186 | - } catch(PDOException $e) { |
|
| 1186 | + } catch (PDOException $e) { |
|
| 1187 | 1187 | return "error (add mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1188 | 1188 | } |
| 1189 | 1189 | } |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | try { |
| 1200 | 1200 | $sth = $Connection->db->prepare($query); |
| 1201 | 1201 | $sth->execute(); |
| 1202 | - } catch(PDOException $e) { |
|
| 1202 | + } catch (PDOException $e) { |
|
| 1203 | 1203 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1204 | 1204 | } |
| 1205 | 1205 | return $error; |
@@ -1209,13 +1209,13 @@ discard block |
||
| 1209 | 1209 | global $globalDBdriver; |
| 1210 | 1210 | $Connection = new Connection(); |
| 1211 | 1211 | $error = ''; |
| 1212 | - if ($Connection->checkColumnName('aircraft','mfr')) { |
|
| 1212 | + if ($Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1213 | 1213 | // drop mfr to aircraft |
| 1214 | 1214 | $query = "ALTER TABLE aircraft DROP COLUMN mfr"; |
| 1215 | 1215 | try { |
| 1216 | 1216 | $sth = $Connection->db->prepare($query); |
| 1217 | 1217 | $sth->execute(); |
| 1218 | - } catch(PDOException $e) { |
|
| 1218 | + } catch (PDOException $e) { |
|
| 1219 | 1219 | return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1220 | 1220 | } |
| 1221 | 1221 | } |
@@ -1231,7 +1231,7 @@ discard block |
||
| 1231 | 1231 | try { |
| 1232 | 1232 | $sth = $Connection->db->prepare($query); |
| 1233 | 1233 | $sth->execute(); |
| 1234 | - } catch(PDOException $e) { |
|
| 1234 | + } catch (PDOException $e) { |
|
| 1235 | 1235 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1236 | 1236 | } |
| 1237 | 1237 | return $error; |
@@ -1241,33 +1241,33 @@ discard block |
||
| 1241 | 1241 | global $globalDBdriver; |
| 1242 | 1242 | $Connection = new Connection(); |
| 1243 | 1243 | $error = ''; |
| 1244 | - if (!$Connection->indexExists('notam','ref_idx')) { |
|
| 1244 | + if (!$Connection->indexExists('notam', 'ref_idx')) { |
|
| 1245 | 1245 | // Add index key |
| 1246 | 1246 | $query = "create index ref_idx on notam (ref)"; |
| 1247 | 1247 | try { |
| 1248 | 1248 | $sth = $Connection->db->prepare($query); |
| 1249 | 1249 | $sth->execute(); |
| 1250 | - } catch(PDOException $e) { |
|
| 1250 | + } catch (PDOException $e) { |
|
| 1251 | 1251 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1252 | 1252 | } |
| 1253 | 1253 | } |
| 1254 | - if (!$Connection->indexExists('accidents','registration_idx')) { |
|
| 1254 | + if (!$Connection->indexExists('accidents', 'registration_idx')) { |
|
| 1255 | 1255 | // Add index key |
| 1256 | 1256 | $query = "create index registration_idx on accidents (registration)"; |
| 1257 | 1257 | try { |
| 1258 | 1258 | $sth = $Connection->db->prepare($query); |
| 1259 | 1259 | $sth->execute(); |
| 1260 | - } catch(PDOException $e) { |
|
| 1260 | + } catch (PDOException $e) { |
|
| 1261 | 1261 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1262 | 1262 | } |
| 1263 | 1263 | } |
| 1264 | - if (!$Connection->indexExists('accidents','rdts')) { |
|
| 1264 | + if (!$Connection->indexExists('accidents', 'rdts')) { |
|
| 1265 | 1265 | // Add index key |
| 1266 | 1266 | $query = "create index rdts on accidents (registration,date,type,source)"; |
| 1267 | 1267 | try { |
| 1268 | 1268 | $sth = $Connection->db->prepare($query); |
| 1269 | 1269 | $sth->execute(); |
| 1270 | - } catch(PDOException $e) { |
|
| 1270 | + } catch (PDOException $e) { |
|
| 1271 | 1271 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1272 | 1272 | } |
| 1273 | 1273 | } |
@@ -1276,7 +1276,7 @@ discard block |
||
| 1276 | 1276 | try { |
| 1277 | 1277 | $sth = $Connection->db->prepare($query); |
| 1278 | 1278 | $sth->execute(); |
| 1279 | - } catch(PDOException $e) { |
|
| 1279 | + } catch (PDOException $e) { |
|
| 1280 | 1280 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1281 | 1281 | } |
| 1282 | 1282 | return $error; |
@@ -1286,23 +1286,23 @@ discard block |
||
| 1286 | 1286 | global $globalDBdriver; |
| 1287 | 1287 | $Connection = new Connection(); |
| 1288 | 1288 | $error = ''; |
| 1289 | - if (!$Connection->checkColumnName('accidents','airline_name')) { |
|
| 1289 | + if (!$Connection->checkColumnName('accidents', 'airline_name')) { |
|
| 1290 | 1290 | // Add airline_name to accidents |
| 1291 | 1291 | $query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL"; |
| 1292 | 1292 | try { |
| 1293 | 1293 | $sth = $Connection->db->prepare($query); |
| 1294 | 1294 | $sth->execute(); |
| 1295 | - } catch(PDOException $e) { |
|
| 1295 | + } catch (PDOException $e) { |
|
| 1296 | 1296 | return "error (add airline_name column in accidents) : ".$e->getMessage()."\n"; |
| 1297 | 1297 | } |
| 1298 | 1298 | } |
| 1299 | - if (!$Connection->checkColumnName('accidents','airline_icao')) { |
|
| 1299 | + if (!$Connection->checkColumnName('accidents', 'airline_icao')) { |
|
| 1300 | 1300 | // Add airline_icao to accidents |
| 1301 | 1301 | $query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL"; |
| 1302 | 1302 | try { |
| 1303 | 1303 | $sth = $Connection->db->prepare($query); |
| 1304 | 1304 | $sth->execute(); |
| 1305 | - } catch(PDOException $e) { |
|
| 1305 | + } catch (PDOException $e) { |
|
| 1306 | 1306 | return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n"; |
| 1307 | 1307 | } |
| 1308 | 1308 | } |
@@ -1310,7 +1310,7 @@ discard block |
||
| 1310 | 1310 | try { |
| 1311 | 1311 | $sth = $Connection->db->prepare($query); |
| 1312 | 1312 | $sth->execute(); |
| 1313 | - } catch(PDOException $e) { |
|
| 1313 | + } catch (PDOException $e) { |
|
| 1314 | 1314 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1315 | 1315 | } |
| 1316 | 1316 | return $error; |
@@ -1320,13 +1320,13 @@ discard block |
||
| 1320 | 1320 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1321 | 1321 | $Connection = new Connection(); |
| 1322 | 1322 | $error = ''; |
| 1323 | - if (!$Connection->checkColumnName('airlines','alliance')) { |
|
| 1323 | + if (!$Connection->checkColumnName('airlines', 'alliance')) { |
|
| 1324 | 1324 | // Add alliance to airlines |
| 1325 | 1325 | $query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL"; |
| 1326 | 1326 | try { |
| 1327 | 1327 | $sth = $Connection->db->prepare($query); |
| 1328 | 1328 | $sth->execute(); |
| 1329 | - } catch(PDOException $e) { |
|
| 1329 | + } catch (PDOException $e) { |
|
| 1330 | 1330 | return "error (add alliance column in airlines) : ".$e->getMessage()."\n"; |
| 1331 | 1331 | } |
| 1332 | 1332 | } |
@@ -1353,7 +1353,7 @@ discard block |
||
| 1353 | 1353 | try { |
| 1354 | 1354 | $sth = $Connection->db->prepare($query); |
| 1355 | 1355 | $sth->execute(); |
| 1356 | - } catch(PDOException $e) { |
|
| 1356 | + } catch (PDOException $e) { |
|
| 1357 | 1357 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1358 | 1358 | } |
| 1359 | 1359 | return $error; |
@@ -1363,13 +1363,13 @@ discard block |
||
| 1363 | 1363 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1364 | 1364 | $Connection = new Connection(); |
| 1365 | 1365 | $error = ''; |
| 1366 | - if (!$Connection->checkColumnName('airlines','ban_eu')) { |
|
| 1366 | + if (!$Connection->checkColumnName('airlines', 'ban_eu')) { |
|
| 1367 | 1367 | // Add ban_eu to airlines |
| 1368 | 1368 | $query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'"; |
| 1369 | 1369 | try { |
| 1370 | 1370 | $sth = $Connection->db->prepare($query); |
| 1371 | 1371 | $sth->execute(); |
| 1372 | - } catch(PDOException $e) { |
|
| 1372 | + } catch (PDOException $e) { |
|
| 1373 | 1373 | return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n"; |
| 1374 | 1374 | } |
| 1375 | 1375 | } |
@@ -1377,7 +1377,7 @@ discard block |
||
| 1377 | 1377 | try { |
| 1378 | 1378 | $sth = $Connection->db->prepare($query); |
| 1379 | 1379 | $sth->execute(); |
| 1380 | - } catch(PDOException $e) { |
|
| 1380 | + } catch (PDOException $e) { |
|
| 1381 | 1381 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1382 | 1382 | } |
| 1383 | 1383 | return $error; |
@@ -1388,19 +1388,19 @@ discard block |
||
| 1388 | 1388 | $Connection = new Connection(); |
| 1389 | 1389 | $error = ''; |
| 1390 | 1390 | if ($globalDBdriver == 'mysql') { |
| 1391 | - if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') { |
|
| 1391 | + if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') { |
|
| 1392 | 1392 | $query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL"; |
| 1393 | 1393 | try { |
| 1394 | 1394 | $sth = $Connection->db->prepare($query); |
| 1395 | 1395 | $sth->execute(); |
| 1396 | - } catch(PDOException $e) { |
|
| 1396 | + } catch (PDOException $e) { |
|
| 1397 | 1397 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1398 | 1398 | } |
| 1399 | 1399 | $query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()"; |
| 1400 | 1400 | try { |
| 1401 | 1401 | $sth = $Connection->db->prepare($query); |
| 1402 | 1402 | $sth->execute(); |
| 1403 | - } catch(PDOException $e) { |
|
| 1403 | + } catch (PDOException $e) { |
|
| 1404 | 1404 | return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n"; |
| 1405 | 1405 | } |
| 1406 | 1406 | |
@@ -1408,7 +1408,7 @@ discard block |
||
| 1408 | 1408 | try { |
| 1409 | 1409 | $sth = $Connection->db->prepare($query); |
| 1410 | 1410 | $sth->execute(); |
| 1411 | - } catch(PDOException $e) { |
|
| 1411 | + } catch (PDOException $e) { |
|
| 1412 | 1412 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1413 | 1413 | } |
| 1414 | 1414 | /*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150"; |
@@ -1459,7 +1459,7 @@ discard block |
||
| 1459 | 1459 | try { |
| 1460 | 1460 | $sth = $Connection->db->prepare($query); |
| 1461 | 1461 | $sth->execute(); |
| 1462 | - } catch(PDOException $e) { |
|
| 1462 | + } catch (PDOException $e) { |
|
| 1463 | 1463 | return "error (fix date) : ".$e->getMessage()."\n"; |
| 1464 | 1464 | } |
| 1465 | 1465 | } |
@@ -1544,7 +1544,7 @@ discard block |
||
| 1544 | 1544 | try { |
| 1545 | 1545 | $sth = $Connection->db->prepare($query); |
| 1546 | 1546 | $sth->execute(); |
| 1547 | - } catch(PDOException $e) { |
|
| 1547 | + } catch (PDOException $e) { |
|
| 1548 | 1548 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1549 | 1549 | } |
| 1550 | 1550 | return $error; |
@@ -1553,13 +1553,13 @@ discard block |
||
| 1553 | 1553 | global $globalDBdriver; |
| 1554 | 1554 | $Connection = new Connection(); |
| 1555 | 1555 | $error = ''; |
| 1556 | - if (!$Connection->indexExists('accidents','type')) { |
|
| 1556 | + if (!$Connection->indexExists('accidents', 'type')) { |
|
| 1557 | 1557 | // Add index key |
| 1558 | 1558 | $query = "create index type on accidents (type,date)"; |
| 1559 | 1559 | try { |
| 1560 | 1560 | $sth = $Connection->db->prepare($query); |
| 1561 | 1561 | $sth->execute(); |
| 1562 | - } catch(PDOException $e) { |
|
| 1562 | + } catch (PDOException $e) { |
|
| 1563 | 1563 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1564 | 1564 | } |
| 1565 | 1565 | } |
@@ -1567,7 +1567,7 @@ discard block |
||
| 1567 | 1567 | try { |
| 1568 | 1568 | $sth = $Connection->db->prepare($query); |
| 1569 | 1569 | $sth->execute(); |
| 1570 | - } catch(PDOException $e) { |
|
| 1570 | + } catch (PDOException $e) { |
|
| 1571 | 1571 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1572 | 1572 | } |
| 1573 | 1573 | return $error; |
@@ -1577,12 +1577,12 @@ discard block |
||
| 1577 | 1577 | global $globalDBdriver; |
| 1578 | 1578 | $Connection = new Connection(); |
| 1579 | 1579 | $error = ''; |
| 1580 | - if (!$Connection->checkColumnName('aircraft_modes','source_type')) { |
|
| 1580 | + if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) { |
|
| 1581 | 1581 | $query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'"; |
| 1582 | 1582 | try { |
| 1583 | 1583 | $sth = $Connection->db->prepare($query); |
| 1584 | 1584 | $sth->execute(); |
| 1585 | - } catch(PDOException $e) { |
|
| 1585 | + } catch (PDOException $e) { |
|
| 1586 | 1586 | return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n"; |
| 1587 | 1587 | } |
| 1588 | 1588 | } |
@@ -1648,7 +1648,7 @@ discard block |
||
| 1648 | 1648 | try { |
| 1649 | 1649 | $sth = $Connection->db->prepare($query); |
| 1650 | 1650 | $sth->execute(); |
| 1651 | - } catch(PDOException $e) { |
|
| 1651 | + } catch (PDOException $e) { |
|
| 1652 | 1652 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1653 | 1653 | } |
| 1654 | 1654 | return $error; |
@@ -1700,7 +1700,7 @@ discard block |
||
| 1700 | 1700 | try { |
| 1701 | 1701 | $sth = $Connection->db->prepare($query); |
| 1702 | 1702 | $sth->execute(); |
| 1703 | - } catch(PDOException $e) { |
|
| 1703 | + } catch (PDOException $e) { |
|
| 1704 | 1704 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 1705 | 1705 | } |
| 1706 | 1706 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -1709,18 +1709,18 @@ discard block |
||
| 1709 | 1709 | try { |
| 1710 | 1710 | $sth = $Connection->db->prepare($query); |
| 1711 | 1711 | $sth->execute(); |
| 1712 | - } catch(PDOException $e) { |
|
| 1712 | + } catch (PDOException $e) { |
|
| 1713 | 1713 | return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n"; |
| 1714 | 1714 | } |
| 1715 | 1715 | } |
| 1716 | 1716 | } |
| 1717 | - if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { |
|
| 1717 | + if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) { |
|
| 1718 | 1718 | // Add index key |
| 1719 | 1719 | $query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)"; |
| 1720 | 1720 | try { |
| 1721 | 1721 | $sth = $Connection->db->prepare($query); |
| 1722 | 1722 | $sth->execute(); |
| 1723 | - } catch(PDOException $e) { |
|
| 1723 | + } catch (PDOException $e) { |
|
| 1724 | 1724 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1725 | 1725 | } |
| 1726 | 1726 | } |
@@ -1728,7 +1728,7 @@ discard block |
||
| 1728 | 1728 | try { |
| 1729 | 1729 | $sth = $Connection->db->prepare($query); |
| 1730 | 1730 | $sth->execute(); |
| 1731 | - } catch(PDOException $e) { |
|
| 1731 | + } catch (PDOException $e) { |
|
| 1732 | 1732 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1733 | 1733 | } |
| 1734 | 1734 | return $error; |
@@ -1739,148 +1739,148 @@ discard block |
||
| 1739 | 1739 | $Connection = new Connection(); |
| 1740 | 1740 | $error = ''; |
| 1741 | 1741 | if ($globalDBdriver == 'mysql') { |
| 1742 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1742 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1743 | 1743 | $query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1744 | 1744 | try { |
| 1745 | 1745 | $sth = $Connection->db->prepare($query); |
| 1746 | 1746 | $sth->execute(); |
| 1747 | - } catch(PDOException $e) { |
|
| 1747 | + } catch (PDOException $e) { |
|
| 1748 | 1748 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1749 | 1749 | } |
| 1750 | 1750 | } |
| 1751 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1751 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1752 | 1752 | $query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1753 | 1753 | try { |
| 1754 | 1754 | $sth = $Connection->db->prepare($query); |
| 1755 | 1755 | $sth->execute(); |
| 1756 | - } catch(PDOException $e) { |
|
| 1756 | + } catch (PDOException $e) { |
|
| 1757 | 1757 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1758 | 1758 | } |
| 1759 | 1759 | } |
| 1760 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1760 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1761 | 1761 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1762 | 1762 | try { |
| 1763 | 1763 | $sth = $Connection->db->prepare($query); |
| 1764 | 1764 | $sth->execute(); |
| 1765 | - } catch(PDOException $e) { |
|
| 1765 | + } catch (PDOException $e) { |
|
| 1766 | 1766 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1767 | 1767 | } |
| 1768 | 1768 | } |
| 1769 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1769 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1770 | 1770 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1771 | 1771 | try { |
| 1772 | 1772 | $sth = $Connection->db->prepare($query); |
| 1773 | 1773 | $sth->execute(); |
| 1774 | - } catch(PDOException $e) { |
|
| 1774 | + } catch (PDOException $e) { |
|
| 1775 | 1775 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1776 | 1776 | } |
| 1777 | 1777 | } |
| 1778 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1778 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1779 | 1779 | $query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1780 | 1780 | try { |
| 1781 | 1781 | $sth = $Connection->db->prepare($query); |
| 1782 | 1782 | $sth->execute(); |
| 1783 | - } catch(PDOException $e) { |
|
| 1783 | + } catch (PDOException $e) { |
|
| 1784 | 1784 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1785 | 1785 | } |
| 1786 | 1786 | } |
| 1787 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1787 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1788 | 1788 | $query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1789 | 1789 | try { |
| 1790 | 1790 | $sth = $Connection->db->prepare($query); |
| 1791 | 1791 | $sth->execute(); |
| 1792 | - } catch(PDOException $e) { |
|
| 1792 | + } catch (PDOException $e) { |
|
| 1793 | 1793 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1794 | 1794 | } |
| 1795 | 1795 | } |
| 1796 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1796 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1797 | 1797 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1798 | 1798 | try { |
| 1799 | 1799 | $sth = $Connection->db->prepare($query); |
| 1800 | 1800 | $sth->execute(); |
| 1801 | - } catch(PDOException $e) { |
|
| 1801 | + } catch (PDOException $e) { |
|
| 1802 | 1802 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1803 | 1803 | } |
| 1804 | 1804 | } |
| 1805 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1805 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1806 | 1806 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1807 | 1807 | try { |
| 1808 | 1808 | $sth = $Connection->db->prepare($query); |
| 1809 | 1809 | $sth->execute(); |
| 1810 | - } catch(PDOException $e) { |
|
| 1810 | + } catch (PDOException $e) { |
|
| 1811 | 1811 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1812 | 1812 | } |
| 1813 | 1813 | } |
| 1814 | 1814 | } else { |
| 1815 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1815 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1816 | 1816 | $query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1817 | 1817 | try { |
| 1818 | 1818 | $sth = $Connection->db->prepare($query); |
| 1819 | 1819 | $sth->execute(); |
| 1820 | - } catch(PDOException $e) { |
|
| 1820 | + } catch (PDOException $e) { |
|
| 1821 | 1821 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1822 | 1822 | } |
| 1823 | 1823 | } |
| 1824 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1824 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1825 | 1825 | $query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL"; |
| 1826 | 1826 | try { |
| 1827 | 1827 | $sth = $Connection->db->prepare($query); |
| 1828 | 1828 | $sth->execute(); |
| 1829 | - } catch(PDOException $e) { |
|
| 1829 | + } catch (PDOException $e) { |
|
| 1830 | 1830 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1831 | 1831 | } |
| 1832 | 1832 | } |
| 1833 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1833 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1834 | 1834 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL"; |
| 1835 | 1835 | try { |
| 1836 | 1836 | $sth = $Connection->db->prepare($query); |
| 1837 | 1837 | $sth->execute(); |
| 1838 | - } catch(PDOException $e) { |
|
| 1838 | + } catch (PDOException $e) { |
|
| 1839 | 1839 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1840 | 1840 | } |
| 1841 | 1841 | } |
| 1842 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1842 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1843 | 1843 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1844 | 1844 | try { |
| 1845 | 1845 | $sth = $Connection->db->prepare($query); |
| 1846 | 1846 | $sth->execute(); |
| 1847 | - } catch(PDOException $e) { |
|
| 1847 | + } catch (PDOException $e) { |
|
| 1848 | 1848 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1849 | 1849 | } |
| 1850 | 1850 | } |
| 1851 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1851 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1852 | 1852 | $query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1853 | 1853 | try { |
| 1854 | 1854 | $sth = $Connection->db->prepare($query); |
| 1855 | 1855 | $sth->execute(); |
| 1856 | - } catch(PDOException $e) { |
|
| 1856 | + } catch (PDOException $e) { |
|
| 1857 | 1857 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1858 | 1858 | } |
| 1859 | 1859 | } |
| 1860 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1860 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1861 | 1861 | $query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL"; |
| 1862 | 1862 | try { |
| 1863 | 1863 | $sth = $Connection->db->prepare($query); |
| 1864 | 1864 | $sth->execute(); |
| 1865 | - } catch(PDOException $e) { |
|
| 1865 | + } catch (PDOException $e) { |
|
| 1866 | 1866 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1867 | 1867 | } |
| 1868 | 1868 | } |
| 1869 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1869 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1870 | 1870 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL"; |
| 1871 | 1871 | try { |
| 1872 | 1872 | $sth = $Connection->db->prepare($query); |
| 1873 | 1873 | $sth->execute(); |
| 1874 | - } catch(PDOException $e) { |
|
| 1874 | + } catch (PDOException $e) { |
|
| 1875 | 1875 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1876 | 1876 | } |
| 1877 | 1877 | } |
| 1878 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1878 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1879 | 1879 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1880 | 1880 | try { |
| 1881 | 1881 | $sth = $Connection->db->prepare($query); |
| 1882 | 1882 | $sth->execute(); |
| 1883 | - } catch(PDOException $e) { |
|
| 1883 | + } catch (PDOException $e) { |
|
| 1884 | 1884 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1885 | 1885 | } |
| 1886 | 1886 | } |
@@ -1889,7 +1889,7 @@ discard block |
||
| 1889 | 1889 | try { |
| 1890 | 1890 | $sth = $Connection->db->prepare($query); |
| 1891 | 1891 | $sth->execute(); |
| 1892 | - } catch(PDOException $e) { |
|
| 1892 | + } catch (PDOException $e) { |
|
| 1893 | 1893 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1894 | 1894 | } |
| 1895 | 1895 | return $error; |
@@ -1904,14 +1904,14 @@ discard block |
||
| 1904 | 1904 | try { |
| 1905 | 1905 | $sth = $Connection->db->prepare($query); |
| 1906 | 1906 | $sth->execute(); |
| 1907 | - } catch(PDOException $e) { |
|
| 1907 | + } catch (PDOException $e) { |
|
| 1908 | 1908 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1909 | 1909 | } |
| 1910 | 1910 | $query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL"; |
| 1911 | 1911 | try { |
| 1912 | 1912 | $sth = $Connection->db->prepare($query); |
| 1913 | 1913 | $sth->execute(); |
| 1914 | - } catch(PDOException $e) { |
|
| 1914 | + } catch (PDOException $e) { |
|
| 1915 | 1915 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1916 | 1916 | } |
| 1917 | 1917 | } else { |
@@ -1919,14 +1919,14 @@ discard block |
||
| 1919 | 1919 | try { |
| 1920 | 1920 | $sth = $Connection->db->prepare($query); |
| 1921 | 1921 | $sth->execute(); |
| 1922 | - } catch(PDOException $e) { |
|
| 1922 | + } catch (PDOException $e) { |
|
| 1923 | 1923 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1924 | 1924 | } |
| 1925 | 1925 | $query = "alter table marine_identity alter column mmsi type varchar(255)"; |
| 1926 | 1926 | try { |
| 1927 | 1927 | $sth = $Connection->db->prepare($query); |
| 1928 | 1928 | $sth->execute(); |
| 1929 | - } catch(PDOException $e) { |
|
| 1929 | + } catch (PDOException $e) { |
|
| 1930 | 1930 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1931 | 1931 | } |
| 1932 | 1932 | } |
@@ -1934,7 +1934,7 @@ discard block |
||
| 1934 | 1934 | try { |
| 1935 | 1935 | $sth = $Connection->db->prepare($query); |
| 1936 | 1936 | $sth->execute(); |
| 1937 | - } catch(PDOException $e) { |
|
| 1937 | + } catch (PDOException $e) { |
|
| 1938 | 1938 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1939 | 1939 | } |
| 1940 | 1940 | return $error; |
@@ -1944,32 +1944,32 @@ discard block |
||
| 1944 | 1944 | global $globalDBdriver; |
| 1945 | 1945 | $Connection = new Connection(); |
| 1946 | 1946 | $error = ''; |
| 1947 | - if (!$Connection->checkColumnName('source_location','last_seen')) { |
|
| 1947 | + if (!$Connection->checkColumnName('source_location', 'last_seen')) { |
|
| 1948 | 1948 | $query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL"; |
| 1949 | 1949 | try { |
| 1950 | 1950 | $sth = $Connection->db->prepare($query); |
| 1951 | 1951 | $sth->execute(); |
| 1952 | - } catch(PDOException $e) { |
|
| 1952 | + } catch (PDOException $e) { |
|
| 1953 | 1953 | return "error (add column last_seen in source_location) : ".$e->getMessage()."\n"; |
| 1954 | 1954 | } |
| 1955 | 1955 | } |
| 1956 | 1956 | if ($globalDBdriver == 'mysql') { |
| 1957 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1957 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1958 | 1958 | $query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL"; |
| 1959 | 1959 | try { |
| 1960 | 1960 | $sth = $Connection->db->prepare($query); |
| 1961 | 1961 | $sth->execute(); |
| 1962 | - } catch(PDOException $e) { |
|
| 1962 | + } catch (PDOException $e) { |
|
| 1963 | 1963 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1964 | 1964 | } |
| 1965 | 1965 | } |
| 1966 | 1966 | } else { |
| 1967 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1967 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1968 | 1968 | $query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL"; |
| 1969 | 1969 | try { |
| 1970 | 1970 | $sth = $Connection->db->prepare($query); |
| 1971 | 1971 | $sth->execute(); |
| 1972 | - } catch(PDOException $e) { |
|
| 1972 | + } catch (PDOException $e) { |
|
| 1973 | 1973 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1974 | 1974 | } |
| 1975 | 1975 | } |
@@ -1978,7 +1978,7 @@ discard block |
||
| 1978 | 1978 | try { |
| 1979 | 1979 | $sth = $Connection->db->prepare($query); |
| 1980 | 1980 | $sth->execute(); |
| 1981 | - } catch(PDOException $e) { |
|
| 1981 | + } catch (PDOException $e) { |
|
| 1982 | 1982 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1983 | 1983 | } |
| 1984 | 1984 | return $error; |
@@ -1988,12 +1988,12 @@ discard block |
||
| 1988 | 1988 | global $globalDBdriver; |
| 1989 | 1989 | $Connection = new Connection(); |
| 1990 | 1990 | $error = ''; |
| 1991 | - if (!$Connection->checkColumnName('source_location','description')) { |
|
| 1991 | + if (!$Connection->checkColumnName('source_location', 'description')) { |
|
| 1992 | 1992 | $query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL"; |
| 1993 | 1993 | try { |
| 1994 | 1994 | $sth = $Connection->db->prepare($query); |
| 1995 | 1995 | $sth->execute(); |
| 1996 | - } catch(PDOException $e) { |
|
| 1996 | + } catch (PDOException $e) { |
|
| 1997 | 1997 | return "error (add column description in source_location) : ".$e->getMessage()."\n"; |
| 1998 | 1998 | } |
| 1999 | 1999 | } |
@@ -2001,7 +2001,7 @@ discard block |
||
| 2001 | 2001 | try { |
| 2002 | 2002 | $sth = $Connection->db->prepare($query); |
| 2003 | 2003 | $sth->execute(); |
| 2004 | - } catch(PDOException $e) { |
|
| 2004 | + } catch (PDOException $e) { |
|
| 2005 | 2005 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2006 | 2006 | } |
| 2007 | 2007 | return $error; |
@@ -2011,39 +2011,39 @@ discard block |
||
| 2011 | 2011 | global $globalDBdriver; |
| 2012 | 2012 | $Connection = new Connection(); |
| 2013 | 2013 | $error = ''; |
| 2014 | - if (!$Connection->checkColumnName('spotter_live','real_altitude')) { |
|
| 2014 | + if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) { |
|
| 2015 | 2015 | $query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2016 | 2016 | try { |
| 2017 | 2017 | $sth = $Connection->db->prepare($query); |
| 2018 | 2018 | $sth->execute(); |
| 2019 | - } catch(PDOException $e) { |
|
| 2019 | + } catch (PDOException $e) { |
|
| 2020 | 2020 | return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n"; |
| 2021 | 2021 | } |
| 2022 | 2022 | } |
| 2023 | - if (!$Connection->checkColumnName('spotter_output','real_altitude')) { |
|
| 2023 | + if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) { |
|
| 2024 | 2024 | $query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2025 | 2025 | try { |
| 2026 | 2026 | $sth = $Connection->db->prepare($query); |
| 2027 | 2027 | $sth->execute(); |
| 2028 | - } catch(PDOException $e) { |
|
| 2028 | + } catch (PDOException $e) { |
|
| 2029 | 2029 | return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n"; |
| 2030 | 2030 | } |
| 2031 | 2031 | } |
| 2032 | - if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) { |
|
| 2032 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) { |
|
| 2033 | 2033 | $query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2034 | 2034 | try { |
| 2035 | 2035 | $sth = $Connection->db->prepare($query); |
| 2036 | 2036 | $sth->execute(); |
| 2037 | - } catch(PDOException $e) { |
|
| 2037 | + } catch (PDOException $e) { |
|
| 2038 | 2038 | return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n"; |
| 2039 | 2039 | } |
| 2040 | 2040 | } |
| 2041 | - if (!$Connection->checkColumnName('spotter_archive','real_altitude')) { |
|
| 2041 | + if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) { |
|
| 2042 | 2042 | $query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2043 | 2043 | try { |
| 2044 | 2044 | $sth = $Connection->db->prepare($query); |
| 2045 | 2045 | $sth->execute(); |
| 2046 | - } catch(PDOException $e) { |
|
| 2046 | + } catch (PDOException $e) { |
|
| 2047 | 2047 | return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n"; |
| 2048 | 2048 | } |
| 2049 | 2049 | } |
@@ -2051,7 +2051,7 @@ discard block |
||
| 2051 | 2051 | try { |
| 2052 | 2052 | $sth = $Connection->db->prepare($query); |
| 2053 | 2053 | $sth->execute(); |
| 2054 | - } catch(PDOException $e) { |
|
| 2054 | + } catch (PDOException $e) { |
|
| 2055 | 2055 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2056 | 2056 | } |
| 2057 | 2057 | return $error; |
@@ -2073,14 +2073,14 @@ discard block |
||
| 2073 | 2073 | try { |
| 2074 | 2074 | $sth = $Connection->db->prepare($query); |
| 2075 | 2075 | $sth->execute(); |
| 2076 | - } catch(PDOException $e) { |
|
| 2076 | + } catch (PDOException $e) { |
|
| 2077 | 2077 | return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n"; |
| 2078 | 2078 | } |
| 2079 | 2079 | $query = "UPDATE config SET value = '44' WHERE name = 'schema_version'"; |
| 2080 | 2080 | try { |
| 2081 | 2081 | $sth = $Connection->db->prepare($query); |
| 2082 | 2082 | $sth->execute(); |
| 2083 | - } catch(PDOException $e) { |
|
| 2083 | + } catch (PDOException $e) { |
|
| 2084 | 2084 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2085 | 2085 | } |
| 2086 | 2086 | return $error; |
@@ -2121,7 +2121,7 @@ discard block |
||
| 2121 | 2121 | try { |
| 2122 | 2122 | $sth = $Connection->db->prepare($query); |
| 2123 | 2123 | $sth->execute(); |
| 2124 | - } catch(PDOException $e) { |
|
| 2124 | + } catch (PDOException $e) { |
|
| 2125 | 2125 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2126 | 2126 | } |
| 2127 | 2127 | return $error; |
@@ -2144,7 +2144,7 @@ discard block |
||
| 2144 | 2144 | try { |
| 2145 | 2145 | $sth = $Connection->db->prepare($query); |
| 2146 | 2146 | $sth->execute(); |
| 2147 | - } catch(PDOException $e) { |
|
| 2147 | + } catch (PDOException $e) { |
|
| 2148 | 2148 | return "error : ".$e->getMessage()."\n"; |
| 2149 | 2149 | } |
| 2150 | 2150 | $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 { |
@@ -804,12 +856,16 @@ discard block |
||
| 804 | 856 | if ($globalDBdriver == 'mysql') { |
| 805 | 857 | if (!$Connection->tableExists('tle')) { |
| 806 | 858 | $error .= create_db::import_file('../db/tle.sql'); |
| 807 | - if ($error != '') return $error; |
|
| 859 | + if ($error != '') { |
|
| 860 | + return $error; |
|
| 861 | + } |
|
| 808 | 862 | } |
| 809 | 863 | } else { |
| 810 | 864 | if (!$Connection->tableExists('tle')) { |
| 811 | 865 | $error .= create_db::import_file('../db/pgsql/tle.sql'); |
| 812 | - if ($error != '') return $error; |
|
| 866 | + if ($error != '') { |
|
| 867 | + return $error; |
|
| 868 | + } |
|
| 813 | 869 | } |
| 814 | 870 | $query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)"; |
| 815 | 871 | try { |
@@ -849,7 +905,9 @@ discard block |
||
| 849 | 905 | } else { |
| 850 | 906 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 851 | 907 | } |
| 852 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 908 | + if ($error != '') { |
|
| 909 | + return 'Import airlines.sql : '.$error; |
|
| 910 | + } |
|
| 853 | 911 | if (!$Connection->checkColumnName('airlines','forsource')) { |
| 854 | 912 | // Add forsource to airlines |
| 855 | 913 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
@@ -1332,20 +1390,28 @@ discard block |
||
| 1332 | 1390 | } |
| 1333 | 1391 | if ($globalDBdriver == 'mysql') { |
| 1334 | 1392 | $error .= create_db::import_file('../db/airlines.sql'); |
| 1335 | - if ($error != '') return $error; |
|
| 1393 | + if ($error != '') { |
|
| 1394 | + return $error; |
|
| 1395 | + } |
|
| 1336 | 1396 | } else { |
| 1337 | 1397 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 1338 | - if ($error != '') return $error; |
|
| 1398 | + if ($error != '') { |
|
| 1399 | + return $error; |
|
| 1400 | + } |
|
| 1339 | 1401 | } |
| 1340 | 1402 | if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) { |
| 1341 | 1403 | include_once(dirname(__FILE__).'/class.update_db.php'); |
| 1342 | 1404 | if (isset($globalVATSIM) && $globalVATSIM) { |
| 1343 | 1405 | $error .= update_db::update_vatsim(); |
| 1344 | - if ($error != '') return $error; |
|
| 1406 | + if ($error != '') { |
|
| 1407 | + return $error; |
|
| 1408 | + } |
|
| 1345 | 1409 | } |
| 1346 | 1410 | if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) { |
| 1347 | 1411 | $error .= update_db::update_IVAO(); |
| 1348 | - if ($error != '') return $error; |
|
| 1412 | + if ($error != '') { |
|
| 1413 | + return $error; |
|
| 1414 | + } |
|
| 1349 | 1415 | } |
| 1350 | 1416 | } |
| 1351 | 1417 | |
@@ -1608,41 +1674,65 @@ discard block |
||
| 1608 | 1674 | if ($globalDBdriver == 'mysql') { |
| 1609 | 1675 | if (!$Connection->tableExists('tracker_output')) { |
| 1610 | 1676 | $error .= create_db::import_file('../db/tracker_output.sql'); |
| 1611 | - if ($error != '') return $error; |
|
| 1677 | + if ($error != '') { |
|
| 1678 | + return $error; |
|
| 1679 | + } |
|
| 1612 | 1680 | } |
| 1613 | 1681 | if (!$Connection->tableExists('tracker_live')) { |
| 1614 | 1682 | $error .= create_db::import_file('../db/tracker_live.sql'); |
| 1615 | - if ($error != '') return $error; |
|
| 1683 | + if ($error != '') { |
|
| 1684 | + return $error; |
|
| 1685 | + } |
|
| 1616 | 1686 | } |
| 1617 | 1687 | if (!$Connection->tableExists('marine_output')) { |
| 1618 | 1688 | $error .= create_db::import_file('../db/marine_output.sql'); |
| 1619 | - if ($error != '') return $error; |
|
| 1689 | + if ($error != '') { |
|
| 1690 | + return $error; |
|
| 1691 | + } |
|
| 1620 | 1692 | } |
| 1621 | 1693 | if (!$Connection->tableExists('marine_live')) { |
| 1622 | 1694 | $error .= create_db::import_file('../db/marine_live.sql'); |
| 1623 | - if ($error != '') return $error; |
|
| 1695 | + if ($error != '') { |
|
| 1696 | + return $error; |
|
| 1697 | + } |
|
| 1624 | 1698 | } |
| 1625 | 1699 | if (!$Connection->tableExists('marine_identity')) { |
| 1626 | 1700 | $error .= create_db::import_file('../db/marine_identity.sql'); |
| 1627 | - if ($error != '') return $error; |
|
| 1701 | + if ($error != '') { |
|
| 1702 | + return $error; |
|
| 1703 | + } |
|
| 1628 | 1704 | } |
| 1629 | 1705 | if (!$Connection->tableExists('marine_mid')) { |
| 1630 | 1706 | $error .= create_db::import_file('../db/marine_mid.sql'); |
| 1631 | - if ($error != '') return $error; |
|
| 1707 | + if ($error != '') { |
|
| 1708 | + return $error; |
|
| 1709 | + } |
|
| 1632 | 1710 | } |
| 1633 | 1711 | } else { |
| 1634 | 1712 | $error .= create_db::import_file('../db/pgsql/tracker_output.sql'); |
| 1635 | - if ($error != '') return $error; |
|
| 1713 | + if ($error != '') { |
|
| 1714 | + return $error; |
|
| 1715 | + } |
|
| 1636 | 1716 | $error .= create_db::import_file('../db/pgsql/tracker_live.sql'); |
| 1637 | - if ($error != '') return $error; |
|
| 1717 | + if ($error != '') { |
|
| 1718 | + return $error; |
|
| 1719 | + } |
|
| 1638 | 1720 | $error .= create_db::import_file('../db/pgsql/marine_output.sql'); |
| 1639 | - if ($error != '') return $error; |
|
| 1721 | + if ($error != '') { |
|
| 1722 | + return $error; |
|
| 1723 | + } |
|
| 1640 | 1724 | $error .= create_db::import_file('../db/pgsql/marine_live.sql'); |
| 1641 | - if ($error != '') return $error; |
|
| 1725 | + if ($error != '') { |
|
| 1726 | + return $error; |
|
| 1727 | + } |
|
| 1642 | 1728 | $error .= create_db::import_file('../db/pgsql/marine_identity.sql'); |
| 1643 | - if ($error != '') return $error; |
|
| 1729 | + if ($error != '') { |
|
| 1730 | + return $error; |
|
| 1731 | + } |
|
| 1644 | 1732 | $error .= create_db::import_file('../db/pgsql/marine_mid.sql'); |
| 1645 | - if ($error != '') return $error; |
|
| 1733 | + if ($error != '') { |
|
| 1734 | + return $error; |
|
| 1735 | + } |
|
| 1646 | 1736 | } |
| 1647 | 1737 | $query = "UPDATE config SET value = '37' WHERE name = 'schema_version'"; |
| 1648 | 1738 | try { |
@@ -1661,39 +1751,61 @@ discard block |
||
| 1661 | 1751 | if ($globalDBdriver == 'mysql') { |
| 1662 | 1752 | if (!$Connection->tableExists('marine_image')) { |
| 1663 | 1753 | $error .= create_db::import_file('../db/marine_image.sql'); |
| 1664 | - if ($error != '') return $error; |
|
| 1754 | + if ($error != '') { |
|
| 1755 | + return $error; |
|
| 1756 | + } |
|
| 1665 | 1757 | } |
| 1666 | 1758 | if (!$Connection->tableExists('marine_archive')) { |
| 1667 | 1759 | $error .= create_db::import_file('../db/marine_archive.sql'); |
| 1668 | - if ($error != '') return $error; |
|
| 1760 | + if ($error != '') { |
|
| 1761 | + return $error; |
|
| 1762 | + } |
|
| 1669 | 1763 | } |
| 1670 | 1764 | if (!$Connection->tableExists('marine_archive_output')) { |
| 1671 | 1765 | $error .= create_db::import_file('../db/marine_archive_output.sql'); |
| 1672 | - if ($error != '') return $error; |
|
| 1766 | + if ($error != '') { |
|
| 1767 | + return $error; |
|
| 1768 | + } |
|
| 1673 | 1769 | } |
| 1674 | 1770 | if (!$Connection->tableExists('tracker_archive')) { |
| 1675 | 1771 | $error .= create_db::import_file('../db/tracker_archive.sql'); |
| 1676 | - if ($error != '') return $error; |
|
| 1772 | + if ($error != '') { |
|
| 1773 | + return $error; |
|
| 1774 | + } |
|
| 1677 | 1775 | } |
| 1678 | 1776 | if (!$Connection->tableExists('tracker_archive_output')) { |
| 1679 | 1777 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 1680 | - if ($error != '') return $error; |
|
| 1778 | + if ($error != '') { |
|
| 1779 | + return $error; |
|
| 1780 | + } |
|
| 1681 | 1781 | } |
| 1682 | 1782 | if (!$Connection->tableExists('marine_archive_output')) { |
| 1683 | 1783 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 1684 | - if ($error != '') return $error; |
|
| 1784 | + if ($error != '') { |
|
| 1785 | + return $error; |
|
| 1786 | + } |
|
| 1685 | 1787 | } |
| 1686 | 1788 | } else { |
| 1687 | 1789 | $error .= create_db::import_file('../db/pgsql/marine_image.sql'); |
| 1688 | - if ($error != '') return $error; |
|
| 1790 | + if ($error != '') { |
|
| 1791 | + return $error; |
|
| 1792 | + } |
|
| 1689 | 1793 | $error .= create_db::import_file('../db/pgsql/marine_archive.sql'); |
| 1690 | - if ($error != '') return $error; |
|
| 1794 | + if ($error != '') { |
|
| 1795 | + return $error; |
|
| 1796 | + } |
|
| 1691 | 1797 | $error .= create_db::import_file('../db/pgsql/marine_archive_output.sql'); |
| 1692 | - if ($error != '') return $error; |
|
| 1798 | + if ($error != '') { |
|
| 1799 | + return $error; |
|
| 1800 | + } |
|
| 1693 | 1801 | $error .= create_db::import_file('../db/pgsql/tracker_archive.sql'); |
| 1694 | - if ($error != '') return $error; |
|
| 1802 | + if ($error != '') { |
|
| 1803 | + return $error; |
|
| 1804 | + } |
|
| 1695 | 1805 | $error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql'); |
| 1696 | - if ($error != '') return $error; |
|
| 1806 | + if ($error != '') { |
|
| 1807 | + return $error; |
|
| 1808 | + } |
|
| 1697 | 1809 | } |
| 1698 | 1810 | if ($globalDBdriver == 'mysql') { |
| 1699 | 1811 | $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
@@ -2064,7 +2176,9 @@ discard block |
||
| 2064 | 2176 | if ($globalDBdriver == 'mysql') { |
| 2065 | 2177 | if (!$Connection->tableExists('tracker_archive_output')) { |
| 2066 | 2178 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 2067 | - if ($error != '') return $error; |
|
| 2179 | + if ($error != '') { |
|
| 2180 | + return $error; |
|
| 2181 | + } |
|
| 2068 | 2182 | } |
| 2069 | 2183 | $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;"; |
| 2070 | 2184 | } else { |
@@ -2092,14 +2206,22 @@ discard block |
||
| 2092 | 2206 | $error = ''; |
| 2093 | 2207 | if ($globalDBdriver == 'mysql') { |
| 2094 | 2208 | $error .= create_db::import_file('../db/airport.sql'); |
| 2095 | - if ($error != '') return $error; |
|
| 2209 | + if ($error != '') { |
|
| 2210 | + return $error; |
|
| 2211 | + } |
|
| 2096 | 2212 | $error .= create_db::import_file('../db/airlines.sql'); |
| 2097 | - if ($error != '') return $error; |
|
| 2213 | + if ($error != '') { |
|
| 2214 | + return $error; |
|
| 2215 | + } |
|
| 2098 | 2216 | } else { |
| 2099 | 2217 | $error .= create_db::import_file('../db/pgsql/airport.sql'); |
| 2100 | - if ($error != '') return $error; |
|
| 2218 | + if ($error != '') { |
|
| 2219 | + return $error; |
|
| 2220 | + } |
|
| 2101 | 2221 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 2102 | - if ($error != '') return $error; |
|
| 2222 | + if ($error != '') { |
|
| 2223 | + return $error; |
|
| 2224 | + } |
|
| 2103 | 2225 | } |
| 2104 | 2226 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 2105 | 2227 | if (file_exists('tmp/ivae_feb2013.zip')) { |
@@ -2116,7 +2238,9 @@ discard block |
||
| 2116 | 2238 | $error .= update_db::update_vatsim(); |
| 2117 | 2239 | } |
| 2118 | 2240 | } |
| 2119 | - if ($error != '') return $error; |
|
| 2241 | + if ($error != '') { |
|
| 2242 | + return $error; |
|
| 2243 | + } |
|
| 2120 | 2244 | $query = "UPDATE config SET value = '45' WHERE name = 'schema_version'"; |
| 2121 | 2245 | try { |
| 2122 | 2246 | $sth = $Connection->db->prepare($query); |
@@ -2136,8 +2260,11 @@ discard block |
||
| 2136 | 2260 | if ($Connection->tableExists('aircraft')) { |
| 2137 | 2261 | if (!$Connection->tableExists('config')) { |
| 2138 | 2262 | $version = '1'; |
| 2139 | - if ($update) return self::update_from_1(); |
|
| 2140 | - else return $version; |
|
| 2263 | + if ($update) { |
|
| 2264 | + return self::update_from_1(); |
|
| 2265 | + } else { |
|
| 2266 | + return $version; |
|
| 2267 | + } |
|
| 2141 | 2268 | } else { |
| 2142 | 2269 | $Connection = new Connection(); |
| 2143 | 2270 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
@@ -2151,182 +2278,316 @@ discard block |
||
| 2151 | 2278 | if ($update) { |
| 2152 | 2279 | if ($result['value'] == '2') { |
| 2153 | 2280 | $error = self::update_from_2(); |
| 2154 | - if ($error != '') return $error; |
|
| 2155 | - else return self::check_version(true); |
|
| 2281 | + if ($error != '') { |
|
| 2282 | + return $error; |
|
| 2283 | + } else { |
|
| 2284 | + return self::check_version(true); |
|
| 2285 | + } |
|
| 2156 | 2286 | } elseif ($result['value'] == '3') { |
| 2157 | 2287 | $error = self::update_from_3(); |
| 2158 | - if ($error != '') return $error; |
|
| 2159 | - else return self::check_version(true); |
|
| 2288 | + if ($error != '') { |
|
| 2289 | + return $error; |
|
| 2290 | + } else { |
|
| 2291 | + return self::check_version(true); |
|
| 2292 | + } |
|
| 2160 | 2293 | } elseif ($result['value'] == '4') { |
| 2161 | 2294 | $error = self::update_from_4(); |
| 2162 | - if ($error != '') return $error; |
|
| 2163 | - else return self::check_version(true); |
|
| 2295 | + if ($error != '') { |
|
| 2296 | + return $error; |
|
| 2297 | + } else { |
|
| 2298 | + return self::check_version(true); |
|
| 2299 | + } |
|
| 2164 | 2300 | } elseif ($result['value'] == '5') { |
| 2165 | 2301 | $error = self::update_from_5(); |
| 2166 | - if ($error != '') return $error; |
|
| 2167 | - else return self::check_version(true); |
|
| 2302 | + if ($error != '') { |
|
| 2303 | + return $error; |
|
| 2304 | + } else { |
|
| 2305 | + return self::check_version(true); |
|
| 2306 | + } |
|
| 2168 | 2307 | } elseif ($result['value'] == '6') { |
| 2169 | 2308 | $error = self::update_from_6(); |
| 2170 | - if ($error != '') return $error; |
|
| 2171 | - else return self::check_version(true); |
|
| 2309 | + if ($error != '') { |
|
| 2310 | + return $error; |
|
| 2311 | + } else { |
|
| 2312 | + return self::check_version(true); |
|
| 2313 | + } |
|
| 2172 | 2314 | } elseif ($result['value'] == '7') { |
| 2173 | 2315 | $error = self::update_from_7(); |
| 2174 | - if ($error != '') return $error; |
|
| 2175 | - else return self::check_version(true); |
|
| 2316 | + if ($error != '') { |
|
| 2317 | + return $error; |
|
| 2318 | + } else { |
|
| 2319 | + return self::check_version(true); |
|
| 2320 | + } |
|
| 2176 | 2321 | } elseif ($result['value'] == '8') { |
| 2177 | 2322 | $error = self::update_from_8(); |
| 2178 | - if ($error != '') return $error; |
|
| 2179 | - else return self::check_version(true); |
|
| 2323 | + if ($error != '') { |
|
| 2324 | + return $error; |
|
| 2325 | + } else { |
|
| 2326 | + return self::check_version(true); |
|
| 2327 | + } |
|
| 2180 | 2328 | } elseif ($result['value'] == '9') { |
| 2181 | 2329 | $error = self::update_from_9(); |
| 2182 | - if ($error != '') return $error; |
|
| 2183 | - else return self::check_version(true); |
|
| 2330 | + if ($error != '') { |
|
| 2331 | + return $error; |
|
| 2332 | + } else { |
|
| 2333 | + return self::check_version(true); |
|
| 2334 | + } |
|
| 2184 | 2335 | } elseif ($result['value'] == '10') { |
| 2185 | 2336 | $error = self::update_from_10(); |
| 2186 | - if ($error != '') return $error; |
|
| 2187 | - else return self::check_version(true); |
|
| 2337 | + if ($error != '') { |
|
| 2338 | + return $error; |
|
| 2339 | + } else { |
|
| 2340 | + return self::check_version(true); |
|
| 2341 | + } |
|
| 2188 | 2342 | } elseif ($result['value'] == '11') { |
| 2189 | 2343 | $error = self::update_from_11(); |
| 2190 | - if ($error != '') return $error; |
|
| 2191 | - else return self::check_version(true); |
|
| 2344 | + if ($error != '') { |
|
| 2345 | + return $error; |
|
| 2346 | + } else { |
|
| 2347 | + return self::check_version(true); |
|
| 2348 | + } |
|
| 2192 | 2349 | } elseif ($result['value'] == '12') { |
| 2193 | 2350 | $error = self::update_from_12(); |
| 2194 | - if ($error != '') return $error; |
|
| 2195 | - else return self::check_version(true); |
|
| 2351 | + if ($error != '') { |
|
| 2352 | + return $error; |
|
| 2353 | + } else { |
|
| 2354 | + return self::check_version(true); |
|
| 2355 | + } |
|
| 2196 | 2356 | } elseif ($result['value'] == '13') { |
| 2197 | 2357 | $error = self::update_from_13(); |
| 2198 | - if ($error != '') return $error; |
|
| 2199 | - else return self::check_version(true); |
|
| 2358 | + if ($error != '') { |
|
| 2359 | + return $error; |
|
| 2360 | + } else { |
|
| 2361 | + return self::check_version(true); |
|
| 2362 | + } |
|
| 2200 | 2363 | } elseif ($result['value'] == '14') { |
| 2201 | 2364 | $error = self::update_from_14(); |
| 2202 | - if ($error != '') return $error; |
|
| 2203 | - else return self::check_version(true); |
|
| 2365 | + if ($error != '') { |
|
| 2366 | + return $error; |
|
| 2367 | + } else { |
|
| 2368 | + return self::check_version(true); |
|
| 2369 | + } |
|
| 2204 | 2370 | } elseif ($result['value'] == '15') { |
| 2205 | 2371 | $error = self::update_from_15(); |
| 2206 | - if ($error != '') return $error; |
|
| 2207 | - else return self::check_version(true); |
|
| 2372 | + if ($error != '') { |
|
| 2373 | + return $error; |
|
| 2374 | + } else { |
|
| 2375 | + return self::check_version(true); |
|
| 2376 | + } |
|
| 2208 | 2377 | } elseif ($result['value'] == '16') { |
| 2209 | 2378 | $error = self::update_from_16(); |
| 2210 | - if ($error != '') return $error; |
|
| 2211 | - else return self::check_version(true); |
|
| 2379 | + if ($error != '') { |
|
| 2380 | + return $error; |
|
| 2381 | + } else { |
|
| 2382 | + return self::check_version(true); |
|
| 2383 | + } |
|
| 2212 | 2384 | } elseif ($result['value'] == '17') { |
| 2213 | 2385 | $error = self::update_from_17(); |
| 2214 | - if ($error != '') return $error; |
|
| 2215 | - else return self::check_version(true); |
|
| 2386 | + if ($error != '') { |
|
| 2387 | + return $error; |
|
| 2388 | + } else { |
|
| 2389 | + return self::check_version(true); |
|
| 2390 | + } |
|
| 2216 | 2391 | } elseif ($result['value'] == '18') { |
| 2217 | 2392 | $error = self::update_from_18(); |
| 2218 | - if ($error != '') return $error; |
|
| 2219 | - else return self::check_version(true); |
|
| 2393 | + if ($error != '') { |
|
| 2394 | + return $error; |
|
| 2395 | + } else { |
|
| 2396 | + return self::check_version(true); |
|
| 2397 | + } |
|
| 2220 | 2398 | } elseif ($result['value'] == '19') { |
| 2221 | 2399 | $error = self::update_from_19(); |
| 2222 | - if ($error != '') return $error; |
|
| 2223 | - else return self::check_version(true); |
|
| 2400 | + if ($error != '') { |
|
| 2401 | + return $error; |
|
| 2402 | + } else { |
|
| 2403 | + return self::check_version(true); |
|
| 2404 | + } |
|
| 2224 | 2405 | } elseif ($result['value'] == '20') { |
| 2225 | 2406 | $error = self::update_from_20(); |
| 2226 | - if ($error != '') return $error; |
|
| 2227 | - else return self::check_version(true); |
|
| 2407 | + if ($error != '') { |
|
| 2408 | + return $error; |
|
| 2409 | + } else { |
|
| 2410 | + return self::check_version(true); |
|
| 2411 | + } |
|
| 2228 | 2412 | } elseif ($result['value'] == '21') { |
| 2229 | 2413 | $error = self::update_from_21(); |
| 2230 | - if ($error != '') return $error; |
|
| 2231 | - else return self::check_version(true); |
|
| 2414 | + if ($error != '') { |
|
| 2415 | + return $error; |
|
| 2416 | + } else { |
|
| 2417 | + return self::check_version(true); |
|
| 2418 | + } |
|
| 2232 | 2419 | } elseif ($result['value'] == '22') { |
| 2233 | 2420 | $error = self::update_from_22(); |
| 2234 | - if ($error != '') return $error; |
|
| 2235 | - else return self::check_version(true); |
|
| 2421 | + if ($error != '') { |
|
| 2422 | + return $error; |
|
| 2423 | + } else { |
|
| 2424 | + return self::check_version(true); |
|
| 2425 | + } |
|
| 2236 | 2426 | } elseif ($result['value'] == '23') { |
| 2237 | 2427 | $error = self::update_from_23(); |
| 2238 | - if ($error != '') return $error; |
|
| 2239 | - else return self::check_version(true); |
|
| 2428 | + if ($error != '') { |
|
| 2429 | + return $error; |
|
| 2430 | + } else { |
|
| 2431 | + return self::check_version(true); |
|
| 2432 | + } |
|
| 2240 | 2433 | } elseif ($result['value'] == '24') { |
| 2241 | 2434 | $error = self::update_from_24(); |
| 2242 | - if ($error != '') return $error; |
|
| 2243 | - else return self::check_version(true); |
|
| 2435 | + if ($error != '') { |
|
| 2436 | + return $error; |
|
| 2437 | + } else { |
|
| 2438 | + return self::check_version(true); |
|
| 2439 | + } |
|
| 2244 | 2440 | } elseif ($result['value'] == '25') { |
| 2245 | 2441 | $error = self::update_from_25(); |
| 2246 | - if ($error != '') return $error; |
|
| 2247 | - else return self::check_version(true); |
|
| 2442 | + if ($error != '') { |
|
| 2443 | + return $error; |
|
| 2444 | + } else { |
|
| 2445 | + return self::check_version(true); |
|
| 2446 | + } |
|
| 2248 | 2447 | } elseif ($result['value'] == '26') { |
| 2249 | 2448 | $error = self::update_from_26(); |
| 2250 | - if ($error != '') return $error; |
|
| 2251 | - else return self::check_version(true); |
|
| 2449 | + if ($error != '') { |
|
| 2450 | + return $error; |
|
| 2451 | + } else { |
|
| 2452 | + return self::check_version(true); |
|
| 2453 | + } |
|
| 2252 | 2454 | } elseif ($result['value'] == '27') { |
| 2253 | 2455 | $error = self::update_from_27(); |
| 2254 | - if ($error != '') return $error; |
|
| 2255 | - else return self::check_version(true); |
|
| 2456 | + if ($error != '') { |
|
| 2457 | + return $error; |
|
| 2458 | + } else { |
|
| 2459 | + return self::check_version(true); |
|
| 2460 | + } |
|
| 2256 | 2461 | } elseif ($result['value'] == '28') { |
| 2257 | 2462 | $error = self::update_from_28(); |
| 2258 | - if ($error != '') return $error; |
|
| 2259 | - else return self::check_version(true); |
|
| 2463 | + if ($error != '') { |
|
| 2464 | + return $error; |
|
| 2465 | + } else { |
|
| 2466 | + return self::check_version(true); |
|
| 2467 | + } |
|
| 2260 | 2468 | } elseif ($result['value'] == '29') { |
| 2261 | 2469 | $error = self::update_from_29(); |
| 2262 | - if ($error != '') return $error; |
|
| 2263 | - else return self::check_version(true); |
|
| 2470 | + if ($error != '') { |
|
| 2471 | + return $error; |
|
| 2472 | + } else { |
|
| 2473 | + return self::check_version(true); |
|
| 2474 | + } |
|
| 2264 | 2475 | } elseif ($result['value'] == '30') { |
| 2265 | 2476 | $error = self::update_from_30(); |
| 2266 | - if ($error != '') return $error; |
|
| 2267 | - else return self::check_version(true); |
|
| 2477 | + if ($error != '') { |
|
| 2478 | + return $error; |
|
| 2479 | + } else { |
|
| 2480 | + return self::check_version(true); |
|
| 2481 | + } |
|
| 2268 | 2482 | } elseif ($result['value'] == '31') { |
| 2269 | 2483 | $error = self::update_from_31(); |
| 2270 | - if ($error != '') return $error; |
|
| 2271 | - else return self::check_version(true); |
|
| 2484 | + if ($error != '') { |
|
| 2485 | + return $error; |
|
| 2486 | + } else { |
|
| 2487 | + return self::check_version(true); |
|
| 2488 | + } |
|
| 2272 | 2489 | } elseif ($result['value'] == '32') { |
| 2273 | 2490 | $error = self::update_from_32(); |
| 2274 | - if ($error != '') return $error; |
|
| 2275 | - else return self::check_version(true); |
|
| 2491 | + if ($error != '') { |
|
| 2492 | + return $error; |
|
| 2493 | + } else { |
|
| 2494 | + return self::check_version(true); |
|
| 2495 | + } |
|
| 2276 | 2496 | } elseif ($result['value'] == '33') { |
| 2277 | 2497 | $error = self::update_from_33(); |
| 2278 | - if ($error != '') return $error; |
|
| 2279 | - else return self::check_version(true); |
|
| 2498 | + if ($error != '') { |
|
| 2499 | + return $error; |
|
| 2500 | + } else { |
|
| 2501 | + return self::check_version(true); |
|
| 2502 | + } |
|
| 2280 | 2503 | } elseif ($result['value'] == '34') { |
| 2281 | 2504 | $error = self::update_from_34(); |
| 2282 | - if ($error != '') return $error; |
|
| 2283 | - else return self::check_version(true); |
|
| 2505 | + if ($error != '') { |
|
| 2506 | + return $error; |
|
| 2507 | + } else { |
|
| 2508 | + return self::check_version(true); |
|
| 2509 | + } |
|
| 2284 | 2510 | } elseif ($result['value'] == '35') { |
| 2285 | 2511 | $error = self::update_from_35(); |
| 2286 | - if ($error != '') return $error; |
|
| 2287 | - else return self::check_version(true); |
|
| 2512 | + if ($error != '') { |
|
| 2513 | + return $error; |
|
| 2514 | + } else { |
|
| 2515 | + return self::check_version(true); |
|
| 2516 | + } |
|
| 2288 | 2517 | } elseif ($result['value'] == '36') { |
| 2289 | 2518 | $error = self::update_from_36(); |
| 2290 | - if ($error != '') return $error; |
|
| 2291 | - else return self::check_version(true); |
|
| 2519 | + if ($error != '') { |
|
| 2520 | + return $error; |
|
| 2521 | + } else { |
|
| 2522 | + return self::check_version(true); |
|
| 2523 | + } |
|
| 2292 | 2524 | } elseif ($result['value'] == '37') { |
| 2293 | 2525 | $error = self::update_from_37(); |
| 2294 | - if ($error != '') return $error; |
|
| 2295 | - else return self::check_version(true); |
|
| 2526 | + if ($error != '') { |
|
| 2527 | + return $error; |
|
| 2528 | + } else { |
|
| 2529 | + return self::check_version(true); |
|
| 2530 | + } |
|
| 2296 | 2531 | } elseif ($result['value'] == '38') { |
| 2297 | 2532 | $error = self::update_from_38(); |
| 2298 | - if ($error != '') return $error; |
|
| 2299 | - else return self::check_version(true); |
|
| 2533 | + if ($error != '') { |
|
| 2534 | + return $error; |
|
| 2535 | + } else { |
|
| 2536 | + return self::check_version(true); |
|
| 2537 | + } |
|
| 2300 | 2538 | } elseif ($result['value'] == '39') { |
| 2301 | 2539 | $error = self::update_from_39(); |
| 2302 | - if ($error != '') return $error; |
|
| 2303 | - else return self::check_version(true); |
|
| 2540 | + if ($error != '') { |
|
| 2541 | + return $error; |
|
| 2542 | + } else { |
|
| 2543 | + return self::check_version(true); |
|
| 2544 | + } |
|
| 2304 | 2545 | } elseif ($result['value'] == '40') { |
| 2305 | 2546 | $error = self::update_from_40(); |
| 2306 | - if ($error != '') return $error; |
|
| 2307 | - else return self::check_version(true); |
|
| 2547 | + if ($error != '') { |
|
| 2548 | + return $error; |
|
| 2549 | + } else { |
|
| 2550 | + return self::check_version(true); |
|
| 2551 | + } |
|
| 2308 | 2552 | } elseif ($result['value'] == '41') { |
| 2309 | 2553 | $error = self::update_from_41(); |
| 2310 | - if ($error != '') return $error; |
|
| 2311 | - else return self::check_version(true); |
|
| 2554 | + if ($error != '') { |
|
| 2555 | + return $error; |
|
| 2556 | + } else { |
|
| 2557 | + return self::check_version(true); |
|
| 2558 | + } |
|
| 2312 | 2559 | } elseif ($result['value'] == '42') { |
| 2313 | 2560 | $error = self::update_from_42(); |
| 2314 | - if ($error != '') return $error; |
|
| 2315 | - else return self::check_version(true); |
|
| 2561 | + if ($error != '') { |
|
| 2562 | + return $error; |
|
| 2563 | + } else { |
|
| 2564 | + return self::check_version(true); |
|
| 2565 | + } |
|
| 2316 | 2566 | } elseif ($result['value'] == '43') { |
| 2317 | 2567 | $error = self::update_from_43(); |
| 2318 | - if ($error != '') return $error; |
|
| 2319 | - else return self::check_version(true); |
|
| 2568 | + if ($error != '') { |
|
| 2569 | + return $error; |
|
| 2570 | + } else { |
|
| 2571 | + return self::check_version(true); |
|
| 2572 | + } |
|
| 2320 | 2573 | } elseif ($result['value'] == '44') { |
| 2321 | 2574 | $error = self::update_from_44(); |
| 2322 | - if ($error != '') return $error; |
|
| 2323 | - else return self::check_version(true); |
|
| 2324 | - } else return ''; |
|
| 2575 | + if ($error != '') { |
|
| 2576 | + return $error; |
|
| 2577 | + } else { |
|
| 2578 | + return self::check_version(true); |
|
| 2579 | + } |
|
| 2580 | + } else { |
|
| 2581 | + return ''; |
|
| 2582 | + } |
|
| 2583 | + } else { |
|
| 2584 | + return $result['value']; |
|
| 2325 | 2585 | } |
| 2326 | - else return $result['value']; |
|
| 2327 | 2586 | } |
| 2328 | 2587 | |
| 2329 | - } else return $version; |
|
| 2588 | + } else { |
|
| 2589 | + return $version; |
|
| 2590 | + } |
|
| 2330 | 2591 | } |
| 2331 | 2592 | |
| 2332 | 2593 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $globalLongitudeMin = '1.0'; //the minimum longitude (east) |
| 43 | 43 | |
| 44 | 44 | $globalCenterLatitude = '46.38'; //the latitude center of your coverage area |
| 45 | -$globalCenterLongitude = '5.29';//the longitude center of your coverage area |
|
| 45 | +$globalCenterLongitude = '5.29'; //the longitude center of your coverage area |
|
| 46 | 46 | |
| 47 | 47 | $globalLiveZoom = '9'; //default zoom on Live Map |
| 48 | 48 | $globalAirportZoom = '7'; //default zoom to begin to display airports icons |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | $globalACARS = FALSE; |
| 152 | 152 | $globalACARSHost = '0.0.0.0'; // Local IP to listen |
| 153 | 153 | $globalACARSPort = '9999'; |
| 154 | -$globalACARSArchive = array('10','80','81','82','3F'); // labels of messages to archive |
|
| 154 | +$globalACARSArchive = array('10', '80', '81', '82', '3F'); // labels of messages to archive |
|
| 155 | 155 | $globalACARSArchiveKeepMonths = '0'; |
| 156 | 156 | |
| 157 | 157 | //APRS configuration (for glidernet) |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | //Check by aircraft ICAO if image is not found by registration |
| 249 | 249 | $globalAircraftImageCheckICAO = TRUE; |
| 250 | 250 | //Sources for Aircraft image |
| 251 | -$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters','customsources'); |
|
| 251 | +$globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters', 'customsources'); |
|
| 252 | 252 | // Custom source configuration {registration} will be replaced by aircraft registration (exif get copyright from exif data for each pic) |
| 253 | 253 | // example of config : $globalAircraftImageCustomSources = array('thumbnail' => 'http://pics.myurl.com/thumbnail/{registration}.jpg','original' => 'http://myurl/original/{registration}.jpg','source_website' => 'https://www.myurl.com', 'source' => 'customsite', 'copyright' => 'myself','exif' => true); |
| 254 | 254 | // ************************ |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | //Retrieve Image from externals sources |
| 258 | 258 | $globalMarineImageFetch = TRUE; |
| 259 | 259 | //Sources for Marine image |
| 260 | -$globalMarineImageSources = array('wikimedia','flickr','deviantart','bing','customsources'); |
|
| 260 | +$globalMarineImageSources = array('wikimedia', 'flickr', 'deviantart', 'bing', 'customsources'); |
|
| 261 | 261 | // Custom source configuration {mmsi} will be replaced by vessel mmsi, {name} by it's name (exif get copyright from exif data for each pic) |
| 262 | 262 | // example of config : $globalMarineImageCustomSources = array('thumbnail' => 'http://pics.myurl.com/thumbnail/{name}.jpg','original' => 'http://myurl/original/{name}.jpg','source_website' => 'https://www.myurl.com', 'source' => 'customsite', 'copyright' => 'myself','exif' => true); |
| 263 | 263 | // ************************ |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | //Retrieve schedules from externals sources (set to FALSE for IVAO or if $globalFork = FALSE) |
| 266 | 266 | $globalSchedulesFetch = TRUE; |
| 267 | 267 | //Sources for airline schedule if not official airline site |
| 268 | -$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 268 | +$globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware'); |
|
| 269 | 269 | |
| 270 | 270 | //Retrieve translation from external sources (set to FALSE for IVAO) |
| 271 | 271 | $globalTranslationFetch = TRUE; |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | require_once('require/class.Satellite.php'); |
| 6 | 6 | |
| 7 | -$trackident = filter_input(INPUT_GET,'trackid',FILTER_SANITIZE_STRING); |
|
| 7 | +$trackident = filter_input(INPUT_GET, 'trackid', FILTER_SANITIZE_STRING); |
|
| 8 | 8 | if ($trackident != '') { |
| 9 | 9 | require_once('require/class.SpotterLive.php'); |
| 10 | 10 | $SpotterLive = new SpotterLive(); |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | $spotterid = $Spotter->getSpotterIDBasedOnFlightAwareID($trackident); |
| 15 | 15 | header('Location: '.$globalURL.'/flightid/'.$spotterid); |
| 16 | 16 | } else { |
| 17 | - setcookie('MapTrack',$resulttrackident[0]['flightaware_id']); |
|
| 17 | + setcookie('MapTrack', $resulttrackident[0]['flightaware_id']); |
|
| 18 | 18 | } |
| 19 | 19 | } else { |
| 20 | 20 | unset($_COOKIE['MapTrack']); |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | <div class="form-group"> |
| 190 | 190 | <label>From (UTC):</label> |
| 191 | 191 | <div class='input-group date' id='datetimepicker1'> |
| 192 | - <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required /> |
|
| 192 | + <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a", $_COOKIE['archive_begin']); ?>" required /> |
|
| 193 | 193 | <span class="input-group-addon"> |
| 194 | 194 | <span class="glyphicon glyphicon-calendar"></span> |
| 195 | 195 | </span> |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | <div class="form-group"> |
| 199 | 199 | <label>To (UTC):</label> |
| 200 | 200 | <div class='input-group date' id='datetimepicker2'> |
| 201 | - <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" /> |
|
| 201 | + <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a", $_COOKIE['archive_end']); ?>" /> |
|
| 202 | 202 | <span class="input-group-addon"> |
| 203 | 203 | <span class="glyphicon glyphicon-calendar"></span> |
| 204 | 204 | </span> |
@@ -323,9 +323,9 @@ discard block |
||
| 323 | 323 | <li><?php echo _("Type of Terrain:"); ?> |
| 324 | 324 | <select class="selectpicker" onchange="terrainType(this);"> |
| 325 | 325 | <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
| 326 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
| 327 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
| 328 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
| 326 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected'; ?>>ellipsoid</option> |
|
| 327 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected'; ?>>vr terrain</option> |
|
| 328 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected'; ?>>ArticDEM</option> |
|
| 329 | 329 | </select> |
| 330 | 330 | </li> |
| 331 | 331 | <?php |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
| 352 | 352 | <?php |
| 353 | 353 | } |
| 354 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 354 | + if (time() > mktime(0, 0, 0, 12, 1, date("Y")) && time() < mktime(0, 0, 0, 12, 31, date("Y"))) { |
|
| 355 | 355 | ?> |
| 356 | 356 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
| 357 | 357 | <?php |
@@ -507,10 +507,10 @@ discard block |
||
| 507 | 507 | $Spotter = new Spotter(); |
| 508 | 508 | $allairlinenames = $Spotter->getAllAirlineNames(); |
| 509 | 509 | } |
| 510 | - foreach($allairlinenames as $airline) { |
|
| 510 | + foreach ($allairlinenames as $airline) { |
|
| 511 | 511 | $airline_name = $airline['airline_name']; |
| 512 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
| 513 | - if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
|
| 512 | + if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...'; |
|
| 513 | + if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['filter_Airlines']))) { |
|
| 514 | 514 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
| 515 | 515 | } else { |
| 516 | 516 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
| 530 | 530 | <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
| 531 | 531 | <?php |
| 532 | - foreach($allalliancenames as $alliance) { |
|
| 532 | + foreach ($allalliancenames as $alliance) { |
|
| 533 | 533 | $alliance_name = $alliance['alliance']; |
| 534 | 534 | if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] == $alliance_name) { |
| 535 | 535 | echo '<option value="'.$alliance_name.'" selected>'.$alliance_name.'</option>'; |
@@ -553,8 +553,8 @@ discard block |
||
| 553 | 553 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 554 | 554 | <?php |
| 555 | 555 | $Spotter = new Spotter(); |
| 556 | - foreach($Spotter->getAllSourceName('aprs') as $source) { |
|
| 557 | - if (isset($_COOKIE['filter_Sources']) && in_array($source['source_name'],explode(',',$_COOKIE['filter_Sources']))) { |
|
| 556 | + foreach ($Spotter->getAllSourceName('aprs') as $source) { |
|
| 557 | + if (isset($_COOKIE['filter_Sources']) && in_array($source['source_name'], explode(',', $_COOKIE['filter_Sources']))) { |
|
| 558 | 558 | echo '<option value="'.$source['source_name'].'" selected>'.$source['source_name'].'</option>'; |
| 559 | 559 | } else { |
| 560 | 560 | echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>'; |
@@ -632,7 +632,7 @@ discard block |
||
| 632 | 632 | else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
| 633 | 633 | else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
| 634 | 634 | |
| 635 | - if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
|
| 635 | + if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'], explode(',', $_COOKIE['sattypes']))) { |
|
| 636 | 636 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |
| 637 | 637 | } else { |
| 638 | 638 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | <?php }; if (isset($globalTracker) && $globalTracker) { ?><td><div id="ibxtracker"><h4><?php echo _("Trackers Detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?> |
| 46 | 46 | </tr></table></div> |
| 47 | 47 | <?php |
| 48 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 48 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 49 | 49 | |
| 50 | 50 | ?> |
| 51 | 51 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script> |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
| 66 | 66 | <?php |
| 67 | 67 | } |
| 68 | - } |
|
| 68 | + } |
|
| 69 | 69 | ?> |
| 70 | 70 | |
| 71 | 71 | <div id="sidebar" class="sidebar collapsed"> |
@@ -76,34 +76,34 @@ discard block |
||
| 76 | 76 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
| 77 | 77 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
| 78 | 78 | <?php |
| 79 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 79 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 80 | 80 | if (isset($globalArchive) && $globalArchive == TRUE) { |
| 81 | 81 | ?> |
| 82 | 82 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
| 83 | 83 | <?php |
| 84 | 84 | } |
| 85 | - } |
|
| 85 | + } |
|
| 86 | 86 | ?> |
| 87 | 87 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
| 88 | 88 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
| 89 | 89 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
| 90 | 90 | <?php |
| 91 | - if (isset($globalMap3D) && $globalMap3D) { |
|
| 91 | + if (isset($globalMap3D) && $globalMap3D) { |
|
| 92 | 92 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
| 93 | 93 | ?> |
| 94 | 94 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
| 95 | 95 | <?php |
| 96 | - } else { |
|
| 97 | - if (isset($globalMapSatellites) && $globalMapSatellites) { |
|
| 96 | + } else { |
|
| 97 | + if (isset($globalMapSatellites) && $globalMapSatellites) { |
|
| 98 | 98 | ?> |
| 99 | 99 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
| 100 | 100 | <?php |
| 101 | - } |
|
| 101 | + } |
|
| 102 | 102 | ?> |
| 103 | 103 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
| 104 | 104 | <?php |
| 105 | 105 | } |
| 106 | - } |
|
| 106 | + } |
|
| 107 | 107 | ?> |
| 108 | 108 | </ul> |
| 109 | 109 | |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | ?> |
| 179 | 179 | </div> |
| 180 | 180 | <?php |
| 181 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 181 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 182 | 182 | ?> |
| 183 | 183 | <div class="sidebar-pane" id="archive"> |
| 184 | 184 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | </form> |
| 239 | 239 | </div> |
| 240 | 240 | <?php |
| 241 | - } |
|
| 241 | + } |
|
| 242 | 242 | ?> |
| 243 | 243 | <div class="sidebar-pane" id="settings"> |
| 244 | 244 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -249,56 +249,56 @@ discard block |
||
| 249 | 249 | <?php |
| 250 | 250 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
| 251 | 251 | else $MapType = $_COOKIE['MapType']; |
| 252 | - ?> |
|
| 252 | + ?> |
|
| 253 | 253 | <?php |
| 254 | 254 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
| 255 | - ?> |
|
| 255 | + ?> |
|
| 256 | 256 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
| 257 | 257 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
| 258 | 258 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
| 259 | 259 | <?php |
| 260 | 260 | } |
| 261 | - ?> |
|
| 261 | + ?> |
|
| 262 | 262 | <?php |
| 263 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 264 | - ?> |
|
| 263 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 264 | + ?> |
|
| 265 | 265 | <?php |
| 266 | - if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 267 | - ?> |
|
| 266 | + if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 267 | + ?> |
|
| 268 | 268 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
| 269 | 269 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
| 270 | 270 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
| 271 | 271 | <?php |
| 272 | - } |
|
| 273 | - ?> |
|
| 272 | + } |
|
| 273 | + ?> |
|
| 274 | 274 | <?php |
| 275 | - if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 276 | - ?> |
|
| 275 | + if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 276 | + ?> |
|
| 277 | 277 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
| 278 | 278 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
| 279 | 279 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
| 280 | 280 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
| 281 | 281 | <?php |
| 282 | - } |
|
| 283 | - ?> |
|
| 282 | + } |
|
| 283 | + ?> |
|
| 284 | 284 | <?php |
| 285 | - if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 286 | - ?> |
|
| 285 | + if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 286 | + ?> |
|
| 287 | 287 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
| 288 | 288 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
| 289 | 289 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
| 290 | 290 | <?php |
| 291 | - } |
|
| 292 | - ?> |
|
| 291 | + } |
|
| 292 | + ?> |
|
| 293 | 293 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
| 294 | 294 | <?php |
| 295 | 295 | } |
| 296 | - ?> |
|
| 296 | + ?> |
|
| 297 | 297 | <?php |
| 298 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 298 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 299 | 299 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
| 300 | 300 | else $MapBoxId = $_COOKIE['MapTypeId']; |
| 301 | - ?> |
|
| 301 | + ?> |
|
| 302 | 302 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
| 303 | 303 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
| 304 | 304 | <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
@@ -312,13 +312,13 @@ discard block |
||
| 312 | 312 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
| 313 | 313 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
| 314 | 314 | <?php |
| 315 | - } |
|
| 316 | - ?> |
|
| 315 | + } |
|
| 316 | + ?> |
|
| 317 | 317 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
| 318 | 318 | </select> |
| 319 | 319 | </li> |
| 320 | 320 | <?php |
| 321 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 321 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 322 | 322 | ?> |
| 323 | 323 | <li><?php echo _("Type of Terrain:"); ?> |
| 324 | 324 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -329,10 +329,10 @@ discard block |
||
| 329 | 329 | </select> |
| 330 | 330 | </li> |
| 331 | 331 | <?php |
| 332 | - } |
|
| 332 | + } |
|
| 333 | 333 | ?> |
| 334 | 334 | <?php |
| 335 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 335 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 336 | 336 | ?> |
| 337 | 337 | |
| 338 | 338 | <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
@@ -341,89 +341,89 @@ discard block |
||
| 341 | 341 | <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
| 342 | 342 | <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
| 343 | 343 | <?php |
| 344 | - } |
|
| 344 | + } |
|
| 345 | 345 | ?> |
| 346 | 346 | <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
| 347 | 347 | <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
| 348 | 348 | <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
| 349 | 349 | <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
| 350 | 350 | <?php |
| 351 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 351 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 352 | 352 | ?> |
| 353 | 353 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
| 354 | 354 | <?php |
| 355 | - } |
|
| 356 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 355 | + } |
|
| 356 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 357 | 357 | ?> |
| 358 | 358 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
| 359 | 359 | <?php |
| 360 | - } |
|
| 360 | + } |
|
| 361 | 361 | ?> |
| 362 | 362 | |
| 363 | 363 | <?php |
| 364 | 364 | if (function_exists('array_column')) { |
| 365 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 366 | - ?> |
|
| 365 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 366 | + ?> |
|
| 367 | 367 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 368 | 368 | <?php |
| 369 | - } |
|
| 369 | + } |
|
| 370 | 370 | } elseif (isset($globalSources)) { |
| 371 | - $dispolar = false; |
|
| 372 | - foreach ($globalSources as $testsource) { |
|
| 373 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 374 | - } |
|
| 375 | - if ($dispolar) { |
|
| 376 | - ?> |
|
| 371 | + $dispolar = false; |
|
| 372 | + foreach ($globalSources as $testsource) { |
|
| 373 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 374 | + } |
|
| 375 | + if ($dispolar) { |
|
| 376 | + ?> |
|
| 377 | 377 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 378 | 378 | <?php |
| 379 | - } |
|
| 380 | - } |
|
| 381 | - ?> |
|
| 379 | + } |
|
| 380 | + } |
|
| 381 | + ?> |
|
| 382 | 382 | <?php |
| 383 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 383 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 384 | 384 | ?> |
| 385 | 385 | |
| 386 | 386 | <?php |
| 387 | 387 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 388 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 389 | - ?> |
|
| 388 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 389 | + ?> |
|
| 390 | 390 | <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
| 391 | 391 | <?php |
| 392 | 392 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 393 | - ?> |
|
| 393 | + ?> |
|
| 394 | 394 | <li><?php echo _("Aircraft icon color:"); ?> |
| 395 | 395 | <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
| 396 | 396 | </li> |
| 397 | 397 | <?php |
| 398 | 398 | } |
| 399 | - } |
|
| 400 | - } |
|
| 401 | - ?> |
|
| 399 | + } |
|
| 400 | + } |
|
| 401 | + ?> |
|
| 402 | 402 | <?php |
| 403 | 403 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 404 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 405 | - ?> |
|
| 404 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 405 | + ?> |
|
| 406 | 406 | <li><?php echo _("Marine icon color:"); ?> |
| 407 | 407 | <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>"> |
| 408 | 408 | </li> |
| 409 | 409 | <?php |
| 410 | - } |
|
| 411 | - } |
|
| 412 | - ?> |
|
| 410 | + } |
|
| 411 | + } |
|
| 412 | + ?> |
|
| 413 | 413 | <?php |
| 414 | 414 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 415 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 416 | - ?> |
|
| 415 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 416 | + ?> |
|
| 417 | 417 | <li><?php echo _("Tracker icon color:"); ?> |
| 418 | 418 | <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>"> |
| 419 | 419 | </li> |
| 420 | 420 | <?php |
| 421 | - } |
|
| 422 | - } |
|
| 423 | - ?> |
|
| 421 | + } |
|
| 422 | + } |
|
| 423 | + ?> |
|
| 424 | 424 | <?php |
| 425 | 425 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 426 | - ?> |
|
| 426 | + ?> |
|
| 427 | 427 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 428 | 428 | <div class="range"> |
| 429 | 429 | <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
@@ -432,9 +432,9 @@ discard block |
||
| 432 | 432 | </li> |
| 433 | 433 | <?php |
| 434 | 434 | } |
| 435 | - ?> |
|
| 435 | + ?> |
|
| 436 | 436 | <?php |
| 437 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 437 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 438 | 438 | ?> |
| 439 | 439 | <?php |
| 440 | 440 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | </li> |
| 466 | 466 | <?php |
| 467 | 467 | } |
| 468 | - } |
|
| 468 | + } |
|
| 469 | 469 | ?> |
| 470 | 470 | <li><?php echo _("Distance unit:"); ?> |
| 471 | 471 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -498,19 +498,19 @@ discard block |
||
| 498 | 498 | <ul> |
| 499 | 499 | <?php |
| 500 | 500 | if (!isset($globalAircraft) || $globalAircraft) { |
| 501 | - ?> |
|
| 501 | + ?> |
|
| 502 | 502 | <?php |
| 503 | 503 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 504 | - ?> |
|
| 504 | + ?> |
|
| 505 | 505 | <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
| 506 | 506 | <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
| 507 | 507 | <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
| 508 | 508 | <?php |
| 509 | 509 | } |
| 510 | - ?> |
|
| 510 | + ?> |
|
| 511 | 511 | <?php |
| 512 | 512 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 513 | - ?> |
|
| 513 | + ?> |
|
| 514 | 514 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 515 | 515 | <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
| 516 | 516 | <?php } ?> |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | <?php } ?> |
| 520 | 520 | <?php |
| 521 | 521 | } |
| 522 | - ?> |
|
| 522 | + ?> |
|
| 523 | 523 | <li><?php echo _("Display airlines:"); ?> |
| 524 | 524 | <br/> |
| 525 | 525 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -539,14 +539,14 @@ discard block |
||
| 539 | 539 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
| 540 | 540 | } |
| 541 | 541 | } |
| 542 | - ?> |
|
| 542 | + ?> |
|
| 543 | 543 | </select> |
| 544 | 544 | </li> |
| 545 | 545 | <?php |
| 546 | 546 | $Spotter = new Spotter(); |
| 547 | 547 | $allalliancenames = $Spotter->getAllAllianceNames(); |
| 548 | 548 | if (!empty($allalliancenames)) { |
| 549 | - ?> |
|
| 549 | + ?> |
|
| 550 | 550 | <li><?php echo _("Display alliance:"); ?> |
| 551 | 551 | <br/> |
| 552 | 552 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -560,18 +560,18 @@ discard block |
||
| 560 | 560 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
| 561 | 561 | } |
| 562 | 562 | } |
| 563 | - ?> |
|
| 563 | + ?> |
|
| 564 | 564 | </select> |
| 565 | 565 | </li> |
| 566 | 566 | <?php |
| 567 | 567 | } |
| 568 | - ?> |
|
| 568 | + ?> |
|
| 569 | 569 | <?php |
| 570 | 570 | } |
| 571 | - ?> |
|
| 571 | + ?> |
|
| 572 | 572 | <?php |
| 573 | 573 | if (isset($globalAPRS) && $globalAPRS) { |
| 574 | - ?> |
|
| 574 | + ?> |
|
| 575 | 575 | <li><?php echo _("Display APRS sources name:"); ?> |
| 576 | 576 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 577 | 577 | <?php |
@@ -583,18 +583,18 @@ discard block |
||
| 583 | 583 | echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>'; |
| 584 | 584 | } |
| 585 | 585 | } |
| 586 | - ?> |
|
| 586 | + ?> |
|
| 587 | 587 | </select> |
| 588 | 588 | </li> |
| 589 | 589 | <?php |
| 590 | 590 | } |
| 591 | - ?> |
|
| 591 | + ?> |
|
| 592 | 592 | <?php |
| 593 | 593 | if (!isset($globalAircraft) && $globalAircraft) { |
| 594 | - ?> |
|
| 594 | + ?> |
|
| 595 | 595 | <?php |
| 596 | 596 | if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
| 597 | - ?> |
|
| 597 | + ?> |
|
| 598 | 598 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 599 | 599 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 600 | 600 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -605,14 +605,14 @@ discard block |
||
| 605 | 605 | </li> |
| 606 | 606 | <?php |
| 607 | 607 | } |
| 608 | - ?> |
|
| 608 | + ?> |
|
| 609 | 609 | <li> |
| 610 | 610 | <?php echo _("Display flight with ident:"); ?> |
| 611 | 611 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
| 612 | 612 | </li> |
| 613 | 613 | <?php |
| 614 | 614 | } |
| 615 | - ?> |
|
| 615 | + ?> |
|
| 616 | 616 | </ul> |
| 617 | 617 | </form> |
| 618 | 618 | <form method="post"> |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | </form> |
| 622 | 622 | </div> |
| 623 | 623 | <?php |
| 624 | - if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 624 | + if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 625 | 625 | ?> |
| 626 | 626 | <div class="sidebar-pane" id="satellites"> |
| 627 | 627 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -661,14 +661,14 @@ discard block |
||
| 661 | 661 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
| 662 | 662 | } |
| 663 | 663 | } |
| 664 | - ?> |
|
| 664 | + ?> |
|
| 665 | 665 | </select> |
| 666 | 666 | </li> |
| 667 | 667 | </ul> |
| 668 | 668 | </form> |
| 669 | 669 | </div> |
| 670 | 670 | <?php |
| 671 | - } |
|
| 671 | + } |
|
| 672 | 672 | ?> |
| 673 | 673 | </div> |
| 674 | 674 | </div> |
@@ -157,11 +157,26 @@ discard block |
||
| 157 | 157 | <li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam();" /><?php echo _("Display NOTAM"); ?></label></div></li> |
| 158 | 158 | <li><?php echo _("NOTAM scope:"); ?> |
| 159 | 159 | <select class="selectpicker" onchange="notamscope(this);"> |
| 160 | - <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option> |
|
| 161 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option> |
|
| 162 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option> |
|
| 163 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option> |
|
| 164 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option> |
|
| 160 | + <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') { |
|
| 161 | + print ' selected'; |
|
| 162 | +} |
|
| 163 | +?>>All</option> |
|
| 164 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') { |
|
| 165 | + print ' selected'; |
|
| 166 | +} |
|
| 167 | +?>>Airport/Enroute warning</option> |
|
| 168 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') { |
|
| 169 | + print ' selected'; |
|
| 170 | +} |
|
| 171 | +?>>Airport warning</option> |
|
| 172 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') { |
|
| 173 | + print ' selected'; |
|
| 174 | +} |
|
| 175 | +?>>Navigation warning</option> |
|
| 176 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') { |
|
| 177 | + print ' selected'; |
|
| 178 | +} |
|
| 179 | +?>>Enroute warning</option> |
|
| 165 | 180 | </select |
| 166 | 181 | </li> |
| 167 | 182 | </ul> |
@@ -189,7 +204,12 @@ discard block |
||
| 189 | 204 | <div class="form-group"> |
| 190 | 205 | <label>From (UTC):</label> |
| 191 | 206 | <div class='input-group date' id='datetimepicker1'> |
| 192 | - <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required /> |
|
| 207 | + <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) { |
|
| 208 | + print $_POST['start_date']; |
|
| 209 | +} elseif (isset($_COOKIE['archive_begin'])) { |
|
| 210 | + print date("m/d/Y h:i a",$_COOKIE['archive_begin']); |
|
| 211 | +} |
|
| 212 | +?>" required /> |
|
| 193 | 213 | <span class="input-group-addon"> |
| 194 | 214 | <span class="glyphicon glyphicon-calendar"></span> |
| 195 | 215 | </span> |
@@ -198,7 +218,12 @@ discard block |
||
| 198 | 218 | <div class="form-group"> |
| 199 | 219 | <label>To (UTC):</label> |
| 200 | 220 | <div class='input-group date' id='datetimepicker2'> |
| 201 | - <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" /> |
|
| 221 | + <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) { |
|
| 222 | + print $_POST['end_date']; |
|
| 223 | +} elseif (isset($_COOKIE['archive_end'])) { |
|
| 224 | + print date("m/d/Y h:i a",$_COOKIE['archive_end']); |
|
| 225 | +} |
|
| 226 | +?>" /> |
|
| 202 | 227 | <span class="input-group-addon"> |
| 203 | 228 | <span class="glyphicon glyphicon-calendar"></span> |
| 204 | 229 | </span> |
@@ -224,8 +249,20 @@ discard block |
||
| 224 | 249 | |
| 225 | 250 | <li><?php echo _("Playback speed:"); ?> |
| 226 | 251 | <div class="range"> |
| 227 | - <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php if (isset($_POST['archivespeed'])) print $_POST['archivespeed']; elseif (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>"> |
|
| 228 | - <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output> |
|
| 252 | + <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php if (isset($_POST['archivespeed'])) { |
|
| 253 | + print $_POST['archivespeed']; |
|
| 254 | +} elseif (isset($_COOKIE['archive_speed'])) { |
|
| 255 | + print $_COOKIE['archive_speed']; |
|
| 256 | +} else { |
|
| 257 | + print '1'; |
|
| 258 | +} |
|
| 259 | +?>"> |
|
| 260 | + <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) { |
|
| 261 | + print $_COOKIE['archive_speed']; |
|
| 262 | +} else { |
|
| 263 | + print '1'; |
|
| 264 | +} |
|
| 265 | +?></output> |
|
| 229 | 266 | </div> |
| 230 | 267 | </li> |
| 231 | 268 | <li><input type="submit" name="archive" value="Show archive" class="btn btn-primary" /></li> |
@@ -247,15 +284,27 @@ discard block |
||
| 247 | 284 | <li><?php echo _("Type of Map:"); ?> |
| 248 | 285 | <select class="selectpicker" onchange="mapType(this);"> |
| 249 | 286 | <?php |
| 250 | - if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
|
| 251 | - else $MapType = $_COOKIE['MapType']; |
|
| 287 | + if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') { |
|
| 288 | + $MapType = $globalMapProvider; |
|
| 289 | + } else { |
|
| 290 | + $MapType = $_COOKIE['MapType']; |
|
| 291 | + } |
|
| 252 | 292 | ?> |
| 253 | 293 | <?php |
| 254 | 294 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
| 255 | 295 | ?> |
| 256 | - <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
|
| 257 | - <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
|
| 258 | - <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
|
| 296 | + <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') { |
|
| 297 | + print ' selected'; |
|
| 298 | +} |
|
| 299 | +?>>Bing-Aerial</option> |
|
| 300 | + <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') { |
|
| 301 | + print ' selected'; |
|
| 302 | +} |
|
| 303 | +?>>Bing-Hybrid</option> |
|
| 304 | + <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') { |
|
| 305 | + print ' selected'; |
|
| 306 | +} |
|
| 307 | +?>>Bing-Road</option> |
|
| 259 | 308 | <?php |
| 260 | 309 | } |
| 261 | 310 | ?> |
@@ -265,56 +314,131 @@ discard block |
||
| 265 | 314 | <?php |
| 266 | 315 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
| 267 | 316 | ?> |
| 268 | - <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
|
| 269 | - <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
|
| 270 | - <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
|
| 317 | + <option value="Here-Aerial"<?php if ($MapType == 'Here') { |
|
| 318 | + print ' selected'; |
|
| 319 | +} |
|
| 320 | +?>>Here-Aerial</option> |
|
| 321 | + <option value="Here-Hybrid"<?php if ($MapType == 'Here') { |
|
| 322 | + print ' selected'; |
|
| 323 | +} |
|
| 324 | +?>>Here-Hybrid</option> |
|
| 325 | + <option value="Here-Road"<?php if ($MapType == 'Here') { |
|
| 326 | + print ' selected'; |
|
| 327 | +} |
|
| 328 | +?>>Here-Road</option> |
|
| 271 | 329 | <?php |
| 272 | 330 | } |
| 273 | 331 | ?> |
| 274 | 332 | <?php |
| 275 | 333 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
| 276 | 334 | ?> |
| 277 | - <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
|
| 278 | - <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
|
| 279 | - <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
|
| 280 | - <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
|
| 335 | + <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') { |
|
| 336 | + print ' selected'; |
|
| 337 | +} |
|
| 338 | +?>>Google Roadmap</option> |
|
| 339 | + <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') { |
|
| 340 | + print ' selected'; |
|
| 341 | +} |
|
| 342 | +?>>Google Satellite</option> |
|
| 343 | + <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') { |
|
| 344 | + print ' selected'; |
|
| 345 | +} |
|
| 346 | +?>>Google Hybrid</option> |
|
| 347 | + <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') { |
|
| 348 | + print ' selected'; |
|
| 349 | +} |
|
| 350 | +?>>Google Terrain</option> |
|
| 281 | 351 | <?php |
| 282 | 352 | } |
| 283 | 353 | ?> |
| 284 | 354 | <?php |
| 285 | 355 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
| 286 | 356 | ?> |
| 287 | - <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
|
| 288 | - <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
|
| 289 | - <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
|
| 357 | + <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') { |
|
| 358 | + print ' selected'; |
|
| 359 | +} |
|
| 360 | +?>>MapQuest-OSM</option> |
|
| 361 | + <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') { |
|
| 362 | + print ' selected'; |
|
| 363 | +} |
|
| 364 | +?>>MapQuest-Aerial</option> |
|
| 365 | + <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') { |
|
| 366 | + print ' selected'; |
|
| 367 | +} |
|
| 368 | +?>>MapQuest-Hybrid</option> |
|
| 290 | 369 | <?php |
| 291 | 370 | } |
| 292 | 371 | ?> |
| 293 | - <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
|
| 372 | + <option value="Yandex"<?php if ($MapType == 'Yandex') { |
|
| 373 | + print ' selected'; |
|
| 374 | +} |
|
| 375 | +?>>Yandex</option> |
|
| 294 | 376 | <?php |
| 295 | 377 | } |
| 296 | 378 | ?> |
| 297 | 379 | <?php |
| 298 | 380 | if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
| 299 | - if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
|
| 300 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 381 | + if (!isset($_COOKIE['MapTypeId'])) { |
|
| 382 | + $MapBoxId = 'default'; |
|
| 383 | + } else { |
|
| 384 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 385 | + } |
|
| 301 | 386 | ?> |
| 302 | - <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
|
| 303 | - <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
|
| 304 | - <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
|
| 305 | - <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option> |
|
| 306 | - <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option> |
|
| 307 | - <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option> |
|
| 308 | - <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option> |
|
| 309 | - <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option> |
|
| 310 | - <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option> |
|
| 311 | - <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option> |
|
| 312 | - <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
|
| 313 | - <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
|
| 387 | + <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') { |
|
| 388 | + print ' selected'; |
|
| 389 | +} |
|
| 390 | +?>>Mapbox default</option> |
|
| 391 | + <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') { |
|
| 392 | + print ' selected'; |
|
| 393 | +} |
|
| 394 | +?>>Mapbox streets</option> |
|
| 395 | + <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') { |
|
| 396 | + print ' selected'; |
|
| 397 | +} |
|
| 398 | +?>>Mapbox light</option> |
|
| 399 | + <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') { |
|
| 400 | + print ' selected'; |
|
| 401 | +} |
|
| 402 | +?>>Mapbox dark</option> |
|
| 403 | + <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') { |
|
| 404 | + print ' selected'; |
|
| 405 | +} |
|
| 406 | +?>>Mapbox satellite</option> |
|
| 407 | + <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') { |
|
| 408 | + print ' selected'; |
|
| 409 | +} |
|
| 410 | +?>>Mapbox streets-satellite</option> |
|
| 411 | + <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') { |
|
| 412 | + print ' selected'; |
|
| 413 | +} |
|
| 414 | +?>>Mapbox streets-basic</option> |
|
| 415 | + <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') { |
|
| 416 | + print ' selected'; |
|
| 417 | +} |
|
| 418 | +?>>Mapbox comic</option> |
|
| 419 | + <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') { |
|
| 420 | + print ' selected'; |
|
| 421 | +} |
|
| 422 | +?>>Mapbox outdoors</option> |
|
| 423 | + <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') { |
|
| 424 | + print ' selected'; |
|
| 425 | +} |
|
| 426 | +?>>Mapbox pencil</option> |
|
| 427 | + <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') { |
|
| 428 | + print ' selected'; |
|
| 429 | +} |
|
| 430 | +?>>Mapbox pirates</option> |
|
| 431 | + <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') { |
|
| 432 | + print ' selected'; |
|
| 433 | +} |
|
| 434 | +?>>Mapbox emerald</option> |
|
| 314 | 435 | <?php |
| 315 | 436 | } |
| 316 | 437 | ?> |
| 317 | - <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
|
| 438 | + <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') { |
|
| 439 | + print ' selected'; |
|
| 440 | +} |
|
| 441 | +?>>OpenStreetMap</option> |
|
| 318 | 442 | </select> |
| 319 | 443 | </li> |
| 320 | 444 | <?php |
@@ -322,10 +446,22 @@ discard block |
||
| 322 | 446 | ?> |
| 323 | 447 | <li><?php echo _("Type of Terrain:"); ?> |
| 324 | 448 | <select class="selectpicker" onchange="terrainType(this);"> |
| 325 | - <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
|
| 326 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
| 327 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
| 328 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
| 449 | + <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') { |
|
| 450 | + print ' selected'; |
|
| 451 | +} |
|
| 452 | +?>>stk terrain</option> |
|
| 453 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') { |
|
| 454 | + print ' selected'; |
|
| 455 | +} |
|
| 456 | +?>>ellipsoid</option> |
|
| 457 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') { |
|
| 458 | + print ' selected'; |
|
| 459 | +} |
|
| 460 | +?>>vr terrain</option> |
|
| 461 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') { |
|
| 462 | + print ' selected'; |
|
| 463 | +} |
|
| 464 | +?>>ArticDEM</option> |
|
| 329 | 465 | </select> |
| 330 | 466 | </li> |
| 331 | 467 | <?php |
@@ -335,22 +471,52 @@ discard block |
||
| 335 | 471 | if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
| 336 | 472 | ?> |
| 337 | 473 | |
| 338 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
|
| 339 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
| 340 | - <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
| 341 | - <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
| 342 | - <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
| 474 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') { |
|
| 475 | + print 'checked'; |
|
| 476 | +} |
|
| 477 | +?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
|
| 478 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) { |
|
| 479 | + print 'checked'; |
|
| 480 | +} |
|
| 481 | +?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
| 482 | + <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) { |
|
| 483 | + print 'checked'; |
|
| 484 | +} |
|
| 485 | +?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
| 486 | + <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) { |
|
| 487 | + print 'checked'; |
|
| 488 | +} |
|
| 489 | +?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
| 490 | + <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) { |
|
| 491 | + print 'checked'; |
|
| 492 | +} |
|
| 493 | +?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
| 343 | 494 | <?php |
| 344 | 495 | } |
| 345 | 496 | ?> |
| 346 | - <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
| 347 | - <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
| 348 | - <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
| 349 | - <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
| 497 | + <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) { |
|
| 498 | + print 'checked'; |
|
| 499 | +} |
|
| 500 | +?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
| 501 | + <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
| 502 | + print 'checked'; |
|
| 503 | +} |
|
| 504 | +?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
| 505 | + <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
| 506 | + print 'checked'; |
|
| 507 | +} |
|
| 508 | +?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
| 509 | + <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
| 510 | + print 'checked'; |
|
| 511 | +} |
|
| 512 | +?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
| 350 | 513 | <?php |
| 351 | 514 | if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
| 352 | 515 | ?> |
| 353 | - <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
| 516 | + <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) { |
|
| 517 | + print 'checked'; |
|
| 518 | +} |
|
| 519 | +?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
| 354 | 520 | <?php |
| 355 | 521 | } |
| 356 | 522 | if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
@@ -364,17 +530,25 @@ discard block |
||
| 364 | 530 | if (function_exists('array_column')) { |
| 365 | 531 | if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
| 366 | 532 | ?> |
| 367 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 533 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
| 534 | + print 'checked'; |
|
| 535 | +} |
|
| 536 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 368 | 537 | <?php |
| 369 | 538 | } |
| 370 | 539 | } elseif (isset($globalSources)) { |
| 371 | 540 | $dispolar = false; |
| 372 | 541 | foreach ($globalSources as $testsource) { |
| 373 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 542 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) { |
|
| 543 | + $dispolar = true; |
|
| 544 | + } |
|
| 374 | 545 | } |
| 375 | 546 | if ($dispolar) { |
| 376 | 547 | ?> |
| 377 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 548 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
| 549 | + print 'checked'; |
|
| 550 | +} |
|
| 551 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 378 | 552 | <?php |
| 379 | 553 | } |
| 380 | 554 | } |
@@ -387,12 +561,22 @@ discard block |
||
| 387 | 561 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 388 | 562 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 389 | 563 | ?> |
| 390 | - <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
| 564 | + <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') { |
|
| 565 | + print 'checked'; |
|
| 566 | +} |
|
| 567 | +?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
| 391 | 568 | <?php |
| 392 | 569 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 393 | 570 | ?> |
| 394 | 571 | <li><?php echo _("Aircraft icon color:"); ?> |
| 395 | - <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
|
| 572 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
| 573 | + print $_COOKIE['IconColor']; |
|
| 574 | +} elseif (isset($globalAircraftIconColor)) { |
|
| 575 | + print $globalAircraftIconColor; |
|
| 576 | +} else { |
|
| 577 | + print '1a3151'; |
|
| 578 | +} |
|
| 579 | +?>"> |
|
| 396 | 580 | </li> |
| 397 | 581 | <?php |
| 398 | 582 | } |
@@ -404,7 +588,14 @@ discard block |
||
| 404 | 588 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 405 | 589 | ?> |
| 406 | 590 | <li><?php echo _("Marine icon color:"); ?> |
| 407 | - <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>"> |
|
| 591 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
| 592 | + print $_COOKIE['MarineIconColor']; |
|
| 593 | +} elseif (isset($globalMarineIconColor)) { |
|
| 594 | + print $globalMarineIconColor; |
|
| 595 | +} else { |
|
| 596 | + print '1a3151'; |
|
| 597 | +} |
|
| 598 | +?>"> |
|
| 408 | 599 | </li> |
| 409 | 600 | <?php |
| 410 | 601 | } |
@@ -415,7 +606,14 @@ discard block |
||
| 415 | 606 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 416 | 607 | ?> |
| 417 | 608 | <li><?php echo _("Tracker icon color:"); ?> |
| 418 | - <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>"> |
|
| 609 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
| 610 | + print $_COOKIE['TrackerIconColor']; |
|
| 611 | +} elseif (isset($globalTrackerIconColor)) { |
|
| 612 | + print $globalTrackerIconColor; |
|
| 613 | +} else { |
|
| 614 | + print '1a3151'; |
|
| 615 | +} |
|
| 616 | +?>"> |
|
| 419 | 617 | </li> |
| 420 | 618 | <?php |
| 421 | 619 | } |
@@ -426,8 +624,22 @@ discard block |
||
| 426 | 624 | ?> |
| 427 | 625 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 428 | 626 | <div class="range"> |
| 429 | - <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
|
| 430 | - <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output> |
|
| 627 | + <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) { |
|
| 628 | + print $_COOKIE['AirportZoom']; |
|
| 629 | +} elseif (isset($globalAirportZoom)) { |
|
| 630 | + print $globalAirportZoom; |
|
| 631 | +} else { |
|
| 632 | + print '7'; |
|
| 633 | +} |
|
| 634 | +?>"> |
|
| 635 | + <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) { |
|
| 636 | + print $_COOKIE['AirportZoom']; |
|
| 637 | +} elseif (isset($globalAirportZoom)) { |
|
| 638 | + print $globalAirportZoom; |
|
| 639 | +} else { |
|
| 640 | + print '7'; |
|
| 641 | +} |
|
| 642 | +?></output> |
|
| 431 | 643 | </div> |
| 432 | 644 | </li> |
| 433 | 645 | <?php |
@@ -439,9 +651,19 @@ discard block |
||
| 439 | 651 | <?php |
| 440 | 652 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 441 | 653 | ?> |
| 442 | - <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Aircraft color"); ?></li> |
|
| 654 | + <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') { |
|
| 655 | + print 'checked'; |
|
| 656 | +} |
|
| 657 | +?> ><?php echo _("Force Aircraft color"); ?></li> |
|
| 443 | 658 | <li><?php echo _("Aircraft icon color:"); ?> |
| 444 | - <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print 'ff0000'; ?>"> |
|
| 659 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
| 660 | + print $_COOKIE['IconColor']; |
|
| 661 | +} elseif (isset($globalAircraftIconColor)) { |
|
| 662 | + print $globalAircraftIconColor; |
|
| 663 | +} else { |
|
| 664 | + print 'ff0000'; |
|
| 665 | +} |
|
| 666 | +?>"> |
|
| 445 | 667 | </li> |
| 446 | 668 | <?php |
| 447 | 669 | } |
@@ -449,9 +671,19 @@ discard block |
||
| 449 | 671 | <?php |
| 450 | 672 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 451 | 673 | ?> |
| 452 | - <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Marine color"); ?></li> |
|
| 674 | + <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') { |
|
| 675 | + print 'checked'; |
|
| 676 | +} |
|
| 677 | +?> ><?php echo _("Force Marine color"); ?></li> |
|
| 453 | 678 | <li><?php echo _("Marine icon color:"); ?> |
| 454 | - <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print 'ff0000'; ?>"> |
|
| 679 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
| 680 | + print $_COOKIE['MarineIconColor']; |
|
| 681 | +} elseif (isset($globalMarineIconColor)) { |
|
| 682 | + print $globalMarineIconColor; |
|
| 683 | +} else { |
|
| 684 | + print 'ff0000'; |
|
| 685 | +} |
|
| 686 | +?>"> |
|
| 455 | 687 | </li> |
| 456 | 688 | <?php |
| 457 | 689 | } |
@@ -459,9 +691,19 @@ discard block |
||
| 459 | 691 | <?php |
| 460 | 692 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 461 | 693 | ?> |
| 462 | - <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Tracker color"); ?></li> |
|
| 694 | + <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') { |
|
| 695 | + print 'checked'; |
|
| 696 | +} |
|
| 697 | +?> ><?php echo _("Force Tracker color"); ?></li> |
|
| 463 | 698 | <li><?php echo _("Tracker icon color:"); ?> |
| 464 | - <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print 'ff0000'; ?>"> |
|
| 699 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
| 700 | + print $_COOKIE['TrackerIconColor']; |
|
| 701 | +} elseif (isset($globalTrackerIconColor)) { |
|
| 702 | + print $globalTrackerIconColor; |
|
| 703 | +} else { |
|
| 704 | + print 'ff0000'; |
|
| 705 | +} |
|
| 706 | +?>"> |
|
| 465 | 707 | </li> |
| 466 | 708 | <?php |
| 467 | 709 | } |
@@ -469,22 +711,46 @@ discard block |
||
| 469 | 711 | ?> |
| 470 | 712 | <li><?php echo _("Distance unit:"); ?> |
| 471 | 713 | <select class="selectpicker" onchange="unitdistance(this);"> |
| 472 | - <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option> |
|
| 473 | - <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option> |
|
| 474 | - <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option> |
|
| 714 | + <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
|
| 715 | + echo ' selected'; |
|
| 716 | +} |
|
| 717 | +?>>km</option> |
|
| 718 | + <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
|
| 719 | + echo ' selected'; |
|
| 720 | +} |
|
| 721 | +?>>nm</option> |
|
| 722 | + <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
|
| 723 | + echo ' selected'; |
|
| 724 | +} |
|
| 725 | +?>>mi</option> |
|
| 475 | 726 | </select> |
| 476 | 727 | </li> |
| 477 | 728 | <li><?php echo _("Altitude unit:"); ?> |
| 478 | 729 | <select class="selectpicker" onchange="unitaltitude(this);"> |
| 479 | - <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option> |
|
| 480 | - <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option> |
|
| 730 | + <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) { |
|
| 731 | + echo ' selected'; |
|
| 732 | +} |
|
| 733 | +?>>m</option> |
|
| 734 | + <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
|
| 735 | + echo ' selected'; |
|
| 736 | +} |
|
| 737 | +?>>feet</option> |
|
| 481 | 738 | </select> |
| 482 | 739 | </li> |
| 483 | 740 | <li><?php echo _("Speed unit:"); ?> |
| 484 | 741 | <select class="selectpicker" onchange="unitspeed(this);"> |
| 485 | - <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option> |
|
| 486 | - <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option> |
|
| 487 | - <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option> |
|
| 742 | + <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) { |
|
| 743 | + echo ' selected'; |
|
| 744 | +} |
|
| 745 | +?>>km/h</option> |
|
| 746 | + <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) { |
|
| 747 | + echo ' selected'; |
|
| 748 | +} |
|
| 749 | +?>>mph</option> |
|
| 750 | + <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) { |
|
| 751 | + echo ' selected'; |
|
| 752 | +} |
|
| 753 | +?>>knots</option> |
|
| 488 | 754 | </select> |
| 489 | 755 | </li> |
| 490 | 756 | |
@@ -502,9 +768,18 @@ discard block |
||
| 502 | 768 | <?php |
| 503 | 769 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 504 | 770 | ?> |
| 505 | - <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
| 506 | - <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
| 507 | - <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
| 771 | + <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) { |
|
| 772 | + print 'checked'; |
|
| 773 | +} |
|
| 774 | +?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
| 775 | + <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) { |
|
| 776 | + print 'checked'; |
|
| 777 | +} |
|
| 778 | +?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
| 779 | + <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) { |
|
| 780 | + print 'checked'; |
|
| 781 | +} |
|
| 782 | +?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
| 508 | 783 | <?php |
| 509 | 784 | } |
| 510 | 785 | ?> |
@@ -512,10 +787,16 @@ discard block |
||
| 512 | 787 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 513 | 788 | ?> |
| 514 | 789 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 515 | - <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
| 790 | + <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) { |
|
| 791 | + print 'checked'; |
|
| 792 | +} |
|
| 793 | +?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
| 516 | 794 | <?php } ?> |
| 517 | 795 | <?php if (isset($globalAPRS) && $globalAPRS) { ?> |
| 518 | - <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
| 796 | + <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) { |
|
| 797 | + print 'checked'; |
|
| 798 | +} |
|
| 799 | +?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
| 519 | 800 | <?php } ?> |
| 520 | 801 | <?php |
| 521 | 802 | } |
@@ -532,7 +813,9 @@ discard block |
||
| 532 | 813 | } |
| 533 | 814 | foreach($allairlinenames as $airline) { |
| 534 | 815 | $airline_name = $airline['airline_name']; |
| 535 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
| 816 | + if (strlen($airline_name) > 30) { |
|
| 817 | + $airline_name = substr($airline_name,0,30).'...'; |
|
| 818 | + } |
|
| 536 | 819 | if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
| 537 | 820 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
| 538 | 821 | } else { |
@@ -550,7 +833,10 @@ discard block |
||
| 550 | 833 | <li><?php echo _("Display alliance:"); ?> |
| 551 | 834 | <br/> |
| 552 | 835 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
| 553 | - <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
| 836 | + <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') { |
|
| 837 | + echo ' selected'; |
|
| 838 | +} |
|
| 839 | +?>><?php echo _("All"); ?></option> |
|
| 554 | 840 | <?php |
| 555 | 841 | foreach($allalliancenames as $alliance) { |
| 556 | 842 | $alliance_name = $alliance['alliance']; |
@@ -597,10 +883,22 @@ discard block |
||
| 597 | 883 | ?> |
| 598 | 884 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 599 | 885 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 600 | - <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
| 601 | - <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option> |
|
| 602 | - <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option> |
|
| 603 | - <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option> |
|
| 886 | + <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') { |
|
| 887 | + echo ' selected'; |
|
| 888 | +} |
|
| 889 | +?>><?php echo _("All"); ?></option> |
|
| 890 | + <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') { |
|
| 891 | + echo ' selected'; |
|
| 892 | +} |
|
| 893 | +?>><?php echo _("Passenger"); ?></option> |
|
| 894 | + <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') { |
|
| 895 | + echo ' selected'; |
|
| 896 | +} |
|
| 897 | +?>><?php echo _("Cargo"); ?></option> |
|
| 898 | + <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') { |
|
| 899 | + echo ' selected'; |
|
| 900 | +} |
|
| 901 | +?>><?php echo _("Military"); ?></option> |
|
| 604 | 902 | </select> |
| 605 | 903 | </li> |
| 606 | 904 | <?php |
@@ -608,7 +906,10 @@ discard block |
||
| 608 | 906 | ?> |
| 609 | 907 | <li> |
| 610 | 908 | <?php echo _("Display flight with ident:"); ?> |
| 611 | - <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
|
| 909 | + <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) { |
|
| 910 | + print $_COOKIE['filter_ident']; |
|
| 911 | +} |
|
| 912 | +?>" /> |
|
| 612 | 913 | </li> |
| 613 | 914 | <?php |
| 614 | 915 | } |
@@ -627,7 +928,10 @@ discard block |
||
| 627 | 928 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
| 628 | 929 | <form> |
| 629 | 930 | <ul> |
| 630 | - <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
| 931 | + <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') { |
|
| 932 | + print 'checked'; |
|
| 933 | +} |
|
| 934 | +?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
| 631 | 935 | <li><?php echo _("Type:"); ?> |
| 632 | 936 | <select class="selectpicker" multiple onchange="sattypes(this);"> |
| 633 | 937 | <?php |
@@ -635,25 +939,45 @@ discard block |
||
| 635 | 939 | $types = $Satellite->get_tle_types(); |
| 636 | 940 | foreach ($types as $type) { |
| 637 | 941 | $type_name = $type['tle_type']; |
| 638 | - if ($type_name == 'musson') $type_name = 'Russian LEO Navigation'; |
|
| 639 | - else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System'; |
|
| 640 | - else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System'; |
|
| 641 | - else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational'; |
|
| 642 | - else if ($type_name == 'gps-ops') $type_name = 'GPS Operational'; |
|
| 643 | - else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System'; |
|
| 644 | - else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 645 | - else if ($type_name == 'sarsat') $type_name = 'Search & Rescue'; |
|
| 646 | - else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring'; |
|
| 647 | - else if ($type_name == 'resource') $type_name = 'Earth Resources'; |
|
| 648 | - else if ($type_name == 'stations') $type_name = 'Space Stations'; |
|
| 649 | - else if ($type_name == 'geo') $type_name = 'Geostationary'; |
|
| 650 | - else if ($type_name == 'amateur') $type_name = 'Amateur Radio'; |
|
| 651 | - else if ($type_name == 'x-comm') $type_name = 'Experimental'; |
|
| 652 | - else if ($type_name == 'other-comm') $type_name = 'Other Comm'; |
|
| 653 | - else if ($type_name == 'science') $type_name = 'Space & Earth Science'; |
|
| 654 | - else if ($type_name == 'military') $type_name = 'Miscellaneous Military'; |
|
| 655 | - else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
|
| 656 | - else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
|
| 942 | + if ($type_name == 'musson') { |
|
| 943 | + $type_name = 'Russian LEO Navigation'; |
|
| 944 | + } else if ($type_name == 'nnss') { |
|
| 945 | + $type_name = 'Navi Navigation Satellite System'; |
|
| 946 | + } else if ($type_name == 'sbas') { |
|
| 947 | + $type_name = 'Satellite-Based Augmentation System'; |
|
| 948 | + } else if ($type_name == 'glo-ops') { |
|
| 949 | + $type_name = 'Glonass Operational'; |
|
| 950 | + } else if ($type_name == 'gps-ops') { |
|
| 951 | + $type_name = 'GPS Operational'; |
|
| 952 | + } else if ($type_name == 'argos') { |
|
| 953 | + $type_name = 'ARGOS Data Collection System'; |
|
| 954 | + } else if ($type_name == 'tdrss') { |
|
| 955 | + $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 956 | + } else if ($type_name == 'sarsat') { |
|
| 957 | + $type_name = 'Search & Rescue'; |
|
| 958 | + } else if ($type_name == 'dmc') { |
|
| 959 | + $type_name = 'Disaster Monitoring'; |
|
| 960 | + } else if ($type_name == 'resource') { |
|
| 961 | + $type_name = 'Earth Resources'; |
|
| 962 | + } else if ($type_name == 'stations') { |
|
| 963 | + $type_name = 'Space Stations'; |
|
| 964 | + } else if ($type_name == 'geo') { |
|
| 965 | + $type_name = 'Geostationary'; |
|
| 966 | + } else if ($type_name == 'amateur') { |
|
| 967 | + $type_name = 'Amateur Radio'; |
|
| 968 | + } else if ($type_name == 'x-comm') { |
|
| 969 | + $type_name = 'Experimental'; |
|
| 970 | + } else if ($type_name == 'other-comm') { |
|
| 971 | + $type_name = 'Other Comm'; |
|
| 972 | + } else if ($type_name == 'science') { |
|
| 973 | + $type_name = 'Space & Earth Science'; |
|
| 974 | + } else if ($type_name == 'military') { |
|
| 975 | + $type_name = 'Miscellaneous Military'; |
|
| 976 | + } else if ($type_name == 'radar') { |
|
| 977 | + $type_name = 'Radar Calibration'; |
|
| 978 | + } else if ($type_name == 'tle-new') { |
|
| 979 | + $type_name = 'Last 30 days launches'; |
|
| 980 | + } |
|
| 657 | 981 | |
| 658 | 982 | if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
| 659 | 983 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |
@@ -27,15 +27,21 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | -if ($authorize === false) die; |
|
| 30 | +if ($authorize === false) { |
|
| 31 | + die; |
|
| 32 | +} |
|
| 31 | 33 | |
| 32 | -if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
|
| 34 | +if (isset($globalTracker) && $globalTracker) { |
|
| 35 | + require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
|
| 36 | +} |
|
| 33 | 37 | if (isset($globalMarine) && $globalMarine) { |
| 34 | 38 | require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
| 35 | 39 | require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
| 36 | 40 | } |
| 37 | 41 | |
| 38 | -if (!isset($globalDebug)) $globalDebug = FALSE; |
|
| 42 | +if (!isset($globalDebug)) { |
|
| 43 | + $globalDebug = FALSE; |
|
| 44 | +} |
|
| 39 | 45 | |
| 40 | 46 | // Check if schema is at latest version |
| 41 | 47 | $Connection = new Connection(); |
@@ -45,10 +51,16 @@ discard block |
||
| 45 | 51 | } |
| 46 | 52 | |
| 47 | 53 | if (isset($globalServer) && $globalServer) { |
| 48 | - if ($globalDebug) echo "Using Server Mode\n"; |
|
| 54 | + if ($globalDebug) { |
|
| 55 | + echo "Using Server Mode\n"; |
|
| 56 | + } |
|
| 49 | 57 | $SI=new SpotterServer(); |
| 50 | -} else $SI=new SpotterImport($Connection->db); |
|
| 51 | -if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
|
| 58 | +} else { |
|
| 59 | + $SI=new SpotterImport($Connection->db); |
|
| 60 | +} |
|
| 61 | +if (isset($globalTracker) && $globalTracker) { |
|
| 62 | + $TI = new TrackerImport($Connection->db); |
|
| 63 | +} |
|
| 52 | 64 | if (isset($globalMarine) && $globalMarine) { |
| 53 | 65 | $AIS = new AIS(); |
| 54 | 66 | $MI = new MarineImport($Connection->db); |
@@ -57,7 +69,9 @@ discard block |
||
| 57 | 69 | date_default_timezone_set('UTC'); |
| 58 | 70 | |
| 59 | 71 | $buffer = ''; |
| 60 | -if (isset($_POST)) $buffer = $_POST; |
|
| 72 | +if (isset($_POST)) { |
|
| 73 | + $buffer = $_POST; |
|
| 74 | +} |
|
| 61 | 75 | $data = array(); |
| 62 | 76 | if (isset($buffer['type_event']) && isset($buffer['lat']) && isset($buffer['lon'])) { |
| 63 | 77 | $data['ident'] = $buffer['device_id']; |
@@ -68,15 +82,27 @@ discard block |
||
| 68 | 82 | //$data['heading'] = $buffer['cap']; // Only N/S/E/W |
| 69 | 83 | $data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']); |
| 70 | 84 | $data['comment'] = ''; |
| 71 | - if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% '; |
|
| 85 | + if (isset($buffer['battery']) && $buffer['battery'] != '') { |
|
| 86 | + $data['comment'] .= 'Battery: '.$buffer['battery'].'% '; |
|
| 87 | + } |
|
| 72 | 88 | //if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' '; |
| 73 | - if (isset($buffer['temp']) && $buffer['temp'] != '') $data['comment'] .= 'Temperature: '.$buffer['temp'].'°C '; |
|
| 74 | - if (isset($buffer['press']) && $buffer['press'] != '') $data['comment'] .= 'Pressure: '.$buffer['press'].'hPa '; |
|
| 89 | + if (isset($buffer['temp']) && $buffer['temp'] != '') { |
|
| 90 | + $data['comment'] .= 'Temperature: '.$buffer['temp'].'°C '; |
|
| 91 | + } |
|
| 92 | + if (isset($buffer['press']) && $buffer['press'] != '') { |
|
| 93 | + $data['comment'] .= 'Pressure: '.$buffer['press'].'hPa '; |
|
| 94 | + } |
|
| 75 | 95 | $TI->add($data); |
| 76 | 96 | unset($data); |
| 77 | 97 | } |
| 78 | -if (isset($SI)) $SI->checkAll(); |
|
| 79 | -if (isset($MI)) $MI->checkAll(); |
|
| 80 | -if (isset($TI)) $TI->checkAll(); |
|
| 98 | +if (isset($SI)) { |
|
| 99 | + $SI->checkAll(); |
|
| 100 | +} |
|
| 101 | +if (isset($MI)) { |
|
| 102 | + $MI->checkAll(); |
|
| 103 | +} |
|
| 104 | +if (isset($TI)) { |
|
| 105 | + $TI->checkAll(); |
|
| 106 | +} |
|
| 81 | 107 | |
| 82 | 108 | ?> |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | require_once(dirname(__FILE__).'/../require/class.Source.php'); |
| 10 | 10 | require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
| 11 | 11 | require_once(dirname(__FILE__).'/../require/class.Common.php'); |
| 12 | -$Common=new Common(); |
|
| 12 | +$Common = new Common(); |
|
| 13 | 13 | $authorize = false; |
| 14 | 14 | $params = array(); |
| 15 | 15 | $userip = $Common->getUserIP(); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | $authorize = true; |
| 21 | 21 | break; |
| 22 | 22 | } |
| 23 | - if ($userip != '' && isset($cb['host']) && in_array($userip,explode(',',$cb['host']))) { |
|
| 23 | + if ($userip != '' && isset($cb['host']) && in_array($userip, explode(',', $cb['host']))) { |
|
| 24 | 24 | $params = $globalSources[$key]; |
| 25 | 25 | $authorize = true; |
| 26 | 26 | break; |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | if (isset($globalServer) && $globalServer) { |
| 48 | 48 | if ($globalDebug) echo "Using Server Mode\n"; |
| 49 | - $SI=new SpotterServer(); |
|
| 50 | -} else $SI=new SpotterImport($Connection->db); |
|
| 49 | + $SI = new SpotterServer(); |
|
| 50 | +} else $SI = new SpotterImport($Connection->db); |
|
| 51 | 51 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
| 52 | 52 | if (isset($globalMarine) && $globalMarine) { |
| 53 | 53 | $AIS = new AIS(); |
| 54 | 54 | $MI = new MarineImport($Connection->db); |
| 55 | 55 | } |
| 56 | -$Source=new Source($Connection->db); |
|
| 56 | +$Source = new Source($Connection->db); |
|
| 57 | 57 | date_default_timezone_set('UTC'); |
| 58 | 58 | |
| 59 | 59 | $buffer = ''; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $data['altitude'] = round($buffer['altitude']*3.28084); |
| 67 | 67 | $data['speed'] = $buffer['speed']; |
| 68 | 68 | //$data['heading'] = $buffer['cap']; // Only N/S/E/W |
| 69 | - $data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']); |
|
| 69 | + $data['datetime'] = date('Y-m-d H:i:s', $buffer['timestamp']); |
|
| 70 | 70 | $data['comment'] = ''; |
| 71 | 71 | if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% '; |
| 72 | 72 | //if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' '; |
@@ -165,6 +165,10 @@ discard block |
||
| 165 | 165 | '\~' => 'TNC Stream SW'); |
| 166 | 166 | |
| 167 | 167 | |
| 168 | + /** |
|
| 169 | + * @param integer $n |
|
| 170 | + * @param integer $s |
|
| 171 | + */ |
|
| 168 | 172 | private function urshift($n, $s) { |
| 169 | 173 | return ($n >= 0) ? ($n >> $s) : |
| 170 | 174 | (($n & 0x7fffffff) >> $s) | |
@@ -565,6 +569,9 @@ discard block |
||
| 565 | 569 | socket_close($this->socket); |
| 566 | 570 | } |
| 567 | 571 | |
| 572 | + /** |
|
| 573 | + * @param string $data |
|
| 574 | + */ |
|
| 568 | 575 | public function send($data) { |
| 569 | 576 | global $globalDebug; |
| 570 | 577 | if ($this->connected === false) $this->connect(); |
@@ -3,10 +3,10 @@ discard block |
||
| 3 | 3 | require_once(dirname(__FILE__).'/class.Common.php'); |
| 4 | 4 | require_once(dirname(__FILE__).'/class.GeoidHeight.php'); |
| 5 | 5 | class aprs { |
| 6 | - private $socket; |
|
| 7 | - private $connected = false; |
|
| 6 | + private $socket; |
|
| 7 | + private $connected = false; |
|
| 8 | 8 | |
| 9 | - protected $symbols = array('/!' => 'Police', |
|
| 9 | + protected $symbols = array('/!' => 'Police', |
|
| 10 | 10 | '/#' => 'DIGI', |
| 11 | 11 | '/$' => 'Phone', |
| 12 | 12 | '/%' => 'DX Cluster', |
@@ -166,13 +166,13 @@ discard block |
||
| 166 | 166 | '\~' => 'TNC Stream SW'); |
| 167 | 167 | |
| 168 | 168 | |
| 169 | - private function urshift($n, $s) { |
|
| 169 | + private function urshift($n, $s) { |
|
| 170 | 170 | return ($n >= 0) ? ($n >> $s) : |
| 171 | - (($n & 0x7fffffff) >> $s) | |
|
| 171 | + (($n & 0x7fffffff) >> $s) | |
|
| 172 | 172 | (0x40000000 >> ($s - 1)); |
| 173 | - } |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | - public function parse($input) { |
|
| 175 | + public function parse($input) { |
|
| 176 | 176 | global $globalDebug; |
| 177 | 177 | $debug = false; |
| 178 | 178 | $result = array(); |
@@ -184,8 +184,8 @@ discard block |
||
| 184 | 184 | |
| 185 | 185 | /* Check that end was found and body has at least one byte. */ |
| 186 | 186 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
| 187 | - if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
| 188 | - return false; |
|
| 187 | + if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
| 188 | + return false; |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | if ($debug) echo 'input : '.$input."\n"; |
@@ -199,34 +199,34 @@ discard block |
||
| 199 | 199 | /* Parse source, target and path. */ |
| 200 | 200 | //FLRDF0A52>APRS,qAS,LSTB |
| 201 | 201 | if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) { |
| 202 | - $ident = $matches[1]; |
|
| 203 | - $all_elements = $matches[2]; |
|
| 204 | - if ($ident == 'AIRCRAFT') { |
|
| 202 | + $ident = $matches[1]; |
|
| 203 | + $all_elements = $matches[2]; |
|
| 204 | + if ($ident == 'AIRCRAFT') { |
|
| 205 | 205 | $result['format_source'] = 'famaprs'; |
| 206 | 206 | $result['source_type'] = 'modes'; |
| 207 | - } elseif ($ident == 'MARINE') { |
|
| 207 | + } elseif ($ident == 'MARINE') { |
|
| 208 | 208 | $result['format_source'] = 'famaprs'; |
| 209 | 209 | $result['source_type'] = 'ais'; |
| 210 | - } else { |
|
| 210 | + } else { |
|
| 211 | 211 | if ($debug) echo 'ident : '.$ident."\n"; |
| 212 | 212 | $result['ident'] = $ident; |
| 213 | - } |
|
| 213 | + } |
|
| 214 | 214 | } else { |
| 215 | - if ($debug) 'No ident'."\n"; |
|
| 216 | - return false; |
|
| 215 | + if ($debug) 'No ident'."\n"; |
|
| 216 | + return false; |
|
| 217 | 217 | } |
| 218 | 218 | $elements = explode(',',$all_elements); |
| 219 | 219 | $source = end($elements); |
| 220 | 220 | $result['source'] = $source; |
| 221 | 221 | foreach ($elements as $element) { |
| 222 | - if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 223 | - //echo "ok"; |
|
| 224 | - //if ($element == 'TCPIP*') return false; |
|
| 225 | - } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 222 | + if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 223 | + //echo "ok"; |
|
| 224 | + //if ($element == 'TCPIP*') return false; |
|
| 225 | + } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 226 | 226 | if ($debug) echo 'element : '.$element."\n"; |
| 227 | 227 | return false; |
| 228 | - } |
|
| 229 | - /* |
|
| 228 | + } |
|
| 229 | + /* |
|
| 230 | 230 | } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) { |
| 231 | 231 | //echo "ok"; |
| 232 | 232 | } else { |
@@ -253,48 +253,48 @@ discard block |
||
| 253 | 253 | $body_parse = substr($body,1); |
| 254 | 254 | //echo 'Body : '.$body."\n"; |
| 255 | 255 | if (preg_match('/^;(.){9}\*/',$body,$matches)) { |
| 256 | - $body_parse = substr($body_parse,10); |
|
| 257 | - $find = true; |
|
| 258 | - //echo $body_parse."\n"; |
|
| 256 | + $body_parse = substr($body_parse,10); |
|
| 257 | + $find = true; |
|
| 258 | + //echo $body_parse."\n"; |
|
| 259 | 259 | } |
| 260 | 260 | if (preg_match('/^`(.*)\//',$body,$matches)) { |
| 261 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 262 | - $find = true; |
|
| 263 | - //echo $body_parse."\n"; |
|
| 261 | + $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 262 | + $find = true; |
|
| 263 | + //echo $body_parse."\n"; |
|
| 264 | 264 | } |
| 265 | 265 | if (preg_match("/^'(.*)\//",$body,$matches)) { |
| 266 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 267 | - $find = true; |
|
| 268 | - //echo $body_parse."\n"; |
|
| 266 | + $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 267 | + $find = true; |
|
| 268 | + //echo $body_parse."\n"; |
|
| 269 | 269 | } |
| 270 | 270 | if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) { |
| 271 | - $find = true; |
|
| 272 | - //print_r($matches); |
|
| 273 | - $timestamp = $matches[0]; |
|
| 274 | - if ($matches[4] == 'h') { |
|
| 271 | + $find = true; |
|
| 272 | + //print_r($matches); |
|
| 273 | + $timestamp = $matches[0]; |
|
| 274 | + if ($matches[4] == 'h') { |
|
| 275 | 275 | $timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]); |
| 276 | 276 | //echo 'timestamp : '.$timestamp.' - now : '.time()."\n"; |
| 277 | 277 | /* |
| 278 | 278 | if (time() + 3900 < $timestamp) $timestamp -= 86400; |
| 279 | 279 | elseif (time() - 82500 > $timestamp) $timestamp += 86400; |
| 280 | 280 | */ |
| 281 | - } elseif ($matches[4] == 'z' || $matches[4] == '/') { |
|
| 281 | + } elseif ($matches[4] == 'z' || $matches[4] == '/') { |
|
| 282 | 282 | // This work or not ? |
| 283 | 283 | $timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]); |
| 284 | - } |
|
| 285 | - $body_parse = substr($body_parse,7); |
|
| 286 | - $result['timestamp'] = $timestamp; |
|
| 287 | - //echo date('Ymd H:i:s',$timestamp); |
|
| 284 | + } |
|
| 285 | + $body_parse = substr($body_parse,7); |
|
| 286 | + $result['timestamp'] = $timestamp; |
|
| 287 | + //echo date('Ymd H:i:s',$timestamp); |
|
| 288 | 288 | } |
| 289 | 289 | if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) { |
| 290 | - $find = true; |
|
| 291 | - $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
|
| 292 | - $body_parse = substr($body_parse,8); |
|
| 293 | - $result['timestamp'] = $timestamp; |
|
| 294 | - //echo date('Ymd H:i:s',$timestamp); |
|
| 290 | + $find = true; |
|
| 291 | + $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
|
| 292 | + $body_parse = substr($body_parse,8); |
|
| 293 | + $result['timestamp'] = $timestamp; |
|
| 294 | + //echo date('Ymd H:i:s',$timestamp); |
|
| 295 | 295 | } |
| 296 | 296 | //if (strlen($body_parse) > 19) { |
| 297 | - if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 297 | + if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 298 | 298 | $find = true; |
| 299 | 299 | // 4658.70N/00707.78Ez |
| 300 | 300 | //print_r(str_split($body_parse)); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | $lon = intval($lon_deg); |
| 314 | 314 | if ($lat > 89 || $lon > 179) return false; |
| 315 | 315 | |
| 316 | - /* |
|
| 316 | + /* |
|
| 317 | 317 | $tmp_5b = str_replace('.','',$lat_min); |
| 318 | 318 | if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) { |
| 319 | 319 | print_r($matches); |
@@ -327,9 +327,9 @@ discard block |
||
| 327 | 327 | $result['longitude'] = $longitude; |
| 328 | 328 | $body_parse = substr($body_parse,18); |
| 329 | 329 | $body_parse_len = strlen($body_parse); |
| 330 | - } |
|
| 331 | - $body_parse_len = strlen($body_parse); |
|
| 332 | - if ($body_parse_len > 0) { |
|
| 330 | + } |
|
| 331 | + $body_parse_len = strlen($body_parse); |
|
| 332 | + if ($body_parse_len > 0) { |
|
| 333 | 333 | /* |
| 334 | 334 | if (!isset($result['timestamp']) && !isset($result['latitude'])) { |
| 335 | 335 | $body_split = str_split($body); |
@@ -363,95 +363,95 @@ discard block |
||
| 363 | 363 | if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
| 364 | 364 | if ($symbol_code != '_') { |
| 365 | 365 | } |
| 366 | - //$body_parse = substr($body_parse,1); |
|
| 367 | - //$body_parse = trim($body_parse); |
|
| 368 | - //$body_parse_len = strlen($body_parse); |
|
| 369 | - if ($body_parse_len >= 7) { |
|
| 366 | + //$body_parse = substr($body_parse,1); |
|
| 367 | + //$body_parse = trim($body_parse); |
|
| 368 | + //$body_parse_len = strlen($body_parse); |
|
| 369 | + if ($body_parse_len >= 7) { |
|
| 370 | 370 | |
| 371 | - if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 372 | - $course = substr($body_parse,0,3); |
|
| 373 | - $tmp_s = intval($course); |
|
| 374 | - if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
| 375 | - $speed = substr($body_parse,4,3); |
|
| 376 | - if ($speed != '...') { |
|
| 377 | - //$result['speed'] = round($speed*1.852); |
|
| 378 | - $result['speed'] = intval($speed); |
|
| 379 | - } |
|
| 380 | - $body_parse = substr($body_parse,7); |
|
| 381 | - } |
|
| 382 | - // Check PHGR, PHG, RNG |
|
| 383 | - } |
|
| 384 | - /* |
|
| 371 | + if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 372 | + $course = substr($body_parse,0,3); |
|
| 373 | + $tmp_s = intval($course); |
|
| 374 | + if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
| 375 | + $speed = substr($body_parse,4,3); |
|
| 376 | + if ($speed != '...') { |
|
| 377 | + //$result['speed'] = round($speed*1.852); |
|
| 378 | + $result['speed'] = intval($speed); |
|
| 379 | + } |
|
| 380 | + $body_parse = substr($body_parse,7); |
|
| 381 | + } |
|
| 382 | + // Check PHGR, PHG, RNG |
|
| 383 | + } |
|
| 384 | + /* |
|
| 385 | 385 | else if ($body_parse_len > 0) { |
| 386 | 386 | $rest = $body_parse; |
| 387 | 387 | } |
| 388 | 388 | */ |
| 389 | - if (strlen($body_parse) > 0) { |
|
| 390 | - if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 391 | - $altitude = intval($matches[1]); |
|
| 392 | - //$result['altitude'] = round($altitude*0.3048); |
|
| 393 | - $result['altitude'] = $altitude; |
|
| 394 | - //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
|
| 395 | - $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 396 | - } |
|
| 397 | - } |
|
| 389 | + if (strlen($body_parse) > 0) { |
|
| 390 | + if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 391 | + $altitude = intval($matches[1]); |
|
| 392 | + //$result['altitude'] = round($altitude*0.3048); |
|
| 393 | + $result['altitude'] = $altitude; |
|
| 394 | + //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
|
| 395 | + $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 396 | + } |
|
| 397 | + } |
|
| 398 | 398 | |
| 399 | - // Telemetry |
|
| 400 | - /* |
|
| 399 | + // Telemetry |
|
| 400 | + /* |
|
| 401 | 401 | if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) { |
| 402 | 402 | // Nothing yet... |
| 403 | 403 | } |
| 404 | 404 | */ |
| 405 | - // DAO |
|
| 405 | + // DAO |
|
| 406 | 406 | |
| 407 | - if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 407 | + if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 408 | 408 | |
| 409 | - $dao = $matches[1]; |
|
| 410 | - if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 409 | + $dao = $matches[1]; |
|
| 410 | + if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 411 | 411 | $dao_split = str_split($dao); |
| 412 | - $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 413 | - $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 412 | + $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 413 | + $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 414 | 414 | |
| 415 | 415 | if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
| 416 | 416 | else $result['latitude'] += $lat_off; |
| 417 | 417 | if ($result['longitude'] < 0) $result['longitude'] -= $lon_off; |
| 418 | 418 | else $result['longitude'] += $lon_off; |
| 419 | - } |
|
| 419 | + } |
|
| 420 | 420 | |
| 421 | - $body_parse = substr($body_parse,6); |
|
| 422 | - } |
|
| 421 | + $body_parse = substr($body_parse,6); |
|
| 422 | + } |
|
| 423 | 423 | |
| 424 | - if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
| 424 | + if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
| 425 | 425 | $result['ident'] = str_replace('_',' ',$matches[1]); |
| 426 | - } |
|
| 427 | - if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
| 426 | + } |
|
| 427 | + if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
| 428 | 428 | $result['squawk'] = $matches[1]; |
| 429 | - } |
|
| 430 | - if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
| 429 | + } |
|
| 430 | + if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
| 431 | 431 | $result['aircraft_icao'] = $matches[1]; |
| 432 | - } |
|
| 433 | - if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) { |
|
| 432 | + } |
|
| 433 | + if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) { |
|
| 434 | 434 | $result['verticalrate'] = $matches[1]; |
| 435 | - } |
|
| 436 | - if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
| 435 | + } |
|
| 436 | + if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
| 437 | 437 | $result['typeid'] = $matches[1]; |
| 438 | - } |
|
| 439 | - if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) { |
|
| 438 | + } |
|
| 439 | + if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) { |
|
| 440 | 440 | $result['statusid'] = $matches[1]; |
| 441 | - } |
|
| 442 | - if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
| 441 | + } |
|
| 442 | + if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
| 443 | 443 | $result['imo'] = $matches[1]; |
| 444 | - } |
|
| 445 | - if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
| 444 | + } |
|
| 445 | + if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
| 446 | 446 | $result['arrival_date'] = $matches[1]; |
| 447 | - } |
|
| 448 | - if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
| 447 | + } |
|
| 448 | + if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
| 449 | 449 | $result['arrival_code'] = str_replace('_',' ',$matches[1]); |
| 450 | - } |
|
| 451 | - // OGN comment |
|
| 450 | + } |
|
| 451 | + // OGN comment |
|
| 452 | 452 | // echo "Before OGN : ".$body_parse."\n"; |
| 453 | - //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
|
| 454 | - if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 453 | + //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
|
| 454 | + if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 455 | 455 | $id = $matches[1]; |
| 456 | 456 | //$mode = substr($id,0,2); |
| 457 | 457 | $address = substr($id,2); |
@@ -481,42 +481,42 @@ discard block |
||
| 481 | 481 | $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
| 482 | 482 | $result['stealth'] = $stealth; |
| 483 | 483 | $result['address'] = $address; |
| 484 | - } |
|
| 484 | + } |
|
| 485 | 485 | |
| 486 | - //Comment |
|
| 487 | - $result['comment'] = trim($body_parse); |
|
| 486 | + //Comment |
|
| 487 | + $result['comment'] = trim($body_parse); |
|
| 488 | 488 | //} else { |
| 489 | - // parse weather |
|
| 490 | - //$body_parse = substr($body_parse,1); |
|
| 491 | - //$body_parse_len = strlen($body_parse); |
|
| 492 | - //echo 'weather'."\n"; |
|
| 493 | - if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 494 | - $result['wind_dir'] = intval($matches[1]); |
|
| 495 | - $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 496 | - $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 497 | - $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 498 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 499 | - } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 489 | + // parse weather |
|
| 490 | + //$body_parse = substr($body_parse,1); |
|
| 491 | + //$body_parse_len = strlen($body_parse); |
|
| 492 | + //echo 'weather'."\n"; |
|
| 493 | + if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 494 | + $result['wind_dir'] = intval($matches[1]); |
|
| 495 | + $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 496 | + $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 497 | + $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 498 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 499 | + } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 500 | 500 | $result['wind_dir'] = intval($matches[1]); |
| 501 | 501 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 502 | 502 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 503 | 503 | $result['temp'] = round(5/9*(($matches[4])-32),1); |
| 504 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 505 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 504 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 505 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 506 | 506 | $result['wind_dir'] = intval($matches[1]); |
| 507 | 507 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 508 | 508 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 509 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 510 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 509 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 510 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 511 | 511 | $result['wind_dir'] = intval($matches[1]); |
| 512 | 512 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 513 | 513 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 514 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 515 | - } |
|
| 516 | - //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 517 | - //g012t088r000p000P000h38b10110 |
|
| 518 | - //g011t086r000p000P000h29b10198 |
|
| 519 | - if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 514 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 515 | + } |
|
| 516 | + //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 517 | + //g012t088r000p000P000h38b10110 |
|
| 518 | + //g011t086r000p000P000h29b10198 |
|
| 519 | + if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 520 | 520 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
| 521 | 521 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
| 522 | 522 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
@@ -524,8 +524,8 @@ discard block |
||
| 524 | 524 | if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
| 525 | 525 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
| 526 | 526 | if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1); |
| 527 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 528 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 527 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 528 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 529 | 529 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
| 530 | 530 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
| 531 | 531 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
@@ -533,8 +533,8 @@ discard block |
||
| 533 | 533 | if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
| 534 | 534 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
| 535 | 535 | if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1); |
| 536 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 537 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 536 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 537 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 538 | 538 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
| 539 | 539 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
| 540 | 540 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
@@ -542,58 +542,58 @@ discard block |
||
| 542 | 542 | if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
| 543 | 543 | if ($matches[7] != '...') $result['humidity'] = intval($matches[7]); |
| 544 | 544 | if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1); |
| 545 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 546 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 545 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 546 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 547 | 547 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
| 548 | 548 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
| 549 | 549 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
| 550 | 550 | if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
| 551 | 551 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
| 552 | 552 | if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
| 553 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 554 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 553 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 554 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 555 | 555 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
| 556 | 556 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
| 557 | 557 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
| 558 | 558 | if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
| 559 | 559 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
| 560 | 560 | if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
| 561 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 562 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 561 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 562 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 563 | 563 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
| 564 | 564 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
| 565 | 565 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
| 566 | 566 | if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
| 567 | 567 | if ($matches[5] != '...') $result['humidity'] = intval($matches[5]); |
| 568 | 568 | if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1); |
| 569 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 570 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 569 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 570 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 571 | 571 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
| 572 | 572 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
| 573 | 573 | if ($matches[2] != '...') $result['humidity'] = intval($matches[3]); |
| 574 | 574 | if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1); |
| 575 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 576 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 575 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 576 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 577 | 577 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
| 578 | 578 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
| 579 | 579 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
| 580 | 580 | if ($matches[4] != '...') $result['humidity'] = intval($matches[4]); |
| 581 | 581 | if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
| 582 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 583 | - } |
|
| 584 | - $result['comment'] = trim($body_parse); |
|
| 582 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 583 | + } |
|
| 584 | + $result['comment'] = trim($body_parse); |
|
| 585 | 585 | } |
| 586 | 586 | } else $result['comment'] = trim($body_parse); |
| 587 | 587 | |
| 588 | - } |
|
| 588 | + } |
|
| 589 | 589 | //} |
| 590 | 590 | if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
| 591 | 591 | if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
| 592 | 592 | if ($debug) print_r($result); |
| 593 | 593 | return $result; |
| 594 | - } |
|
| 594 | + } |
|
| 595 | 595 | |
| 596 | - public function connect() { |
|
| 596 | + public function connect() { |
|
| 597 | 597 | global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport; |
| 598 | 598 | $aprs_connect = 0; |
| 599 | 599 | $aprs_keep = 120; |
@@ -617,24 +617,24 @@ discard block |
||
| 617 | 617 | socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1); |
| 618 | 618 | while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) { |
| 619 | 619 | if (strpos($msgin, "$aprs_ssid verified") !== FALSE) { |
| 620 | - echo 'APRS user verified !'."\n"; |
|
| 621 | - $this->connected = true; |
|
| 622 | - return true; |
|
| 623 | - break; |
|
| 620 | + echo 'APRS user verified !'."\n"; |
|
| 621 | + $this->connected = true; |
|
| 622 | + return true; |
|
| 623 | + break; |
|
| 624 | 624 | } |
| 625 | 625 | if (time()-$authstart > 5) { |
| 626 | - echo 'APRS timeout'."\n"; |
|
| 627 | - break; |
|
| 626 | + echo 'APRS timeout'."\n"; |
|
| 627 | + break; |
|
| 628 | 628 | } |
| 629 | 629 | } |
| 630 | 630 | } |
| 631 | - } |
|
| 631 | + } |
|
| 632 | 632 | |
| 633 | - public function disconnect() { |
|
| 633 | + public function disconnect() { |
|
| 634 | 634 | socket_close($this->socket); |
| 635 | - } |
|
| 635 | + } |
|
| 636 | 636 | |
| 637 | - public function send($data) { |
|
| 637 | + public function send($data) { |
|
| 638 | 638 | global $globalDebug; |
| 639 | 639 | if ($this->connected === false) $this->connect(); |
| 640 | 640 | $send = socket_send( $this->socket , $data , strlen($data),0); |
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | socket_close($this->socket); |
| 644 | 644 | $this->connect(); |
| 645 | 645 | } |
| 646 | - } |
|
| 646 | + } |
|
| 647 | 647 | } |
| 648 | 648 | |
| 649 | 649 | class APRSSpotter extends APRS { |
@@ -167,8 +167,7 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | |
| 169 | 169 | private function urshift($n, $s) { |
| 170 | - return ($n >= 0) ? ($n >> $s) : |
|
| 171 | - (($n & 0x7fffffff) >> $s) | |
|
| 170 | + return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| |
|
| 172 | 171 | (0x40000000 >> ($s - 1)); |
| 173 | 172 | } |
| 174 | 173 | |
@@ -180,7 +179,7 @@ discard block |
||
| 180 | 179 | //$split_input = str_split($input); |
| 181 | 180 | |
| 182 | 181 | /* Find the end of header checking for NULL bytes while doing it. */ |
| 183 | - $splitpos = strpos($input,':'); |
|
| 182 | + $splitpos = strpos($input, ':'); |
|
| 184 | 183 | |
| 185 | 184 | /* Check that end was found and body has at least one byte. */ |
| 186 | 185 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
@@ -190,15 +189,15 @@ discard block |
||
| 190 | 189 | |
| 191 | 190 | if ($debug) echo 'input : '.$input."\n"; |
| 192 | 191 | /* Save header and body. */ |
| 193 | - $body = substr($input,$splitpos+1,$input_len); |
|
| 192 | + $body = substr($input, $splitpos + 1, $input_len); |
|
| 194 | 193 | $body_len = strlen($body); |
| 195 | - $header = substr($input,0,$splitpos); |
|
| 194 | + $header = substr($input, 0, $splitpos); |
|
| 196 | 195 | //$header_len = strlen($header); |
| 197 | 196 | if ($debug) echo 'header : '.$header."\n"; |
| 198 | 197 | |
| 199 | 198 | /* Parse source, target and path. */ |
| 200 | 199 | //FLRDF0A52>APRS,qAS,LSTB |
| 201 | - if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) { |
|
| 200 | + if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) { |
|
| 202 | 201 | $ident = $matches[1]; |
| 203 | 202 | $all_elements = $matches[2]; |
| 204 | 203 | if ($ident == 'AIRCRAFT') { |
@@ -215,14 +214,14 @@ discard block |
||
| 215 | 214 | if ($debug) 'No ident'."\n"; |
| 216 | 215 | return false; |
| 217 | 216 | } |
| 218 | - $elements = explode(',',$all_elements); |
|
| 217 | + $elements = explode(',', $all_elements); |
|
| 219 | 218 | $source = end($elements); |
| 220 | 219 | $result['source'] = $source; |
| 221 | 220 | foreach ($elements as $element) { |
| 222 | - if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 221 | + if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) { |
|
| 223 | 222 | //echo "ok"; |
| 224 | 223 | //if ($element == 'TCPIP*') return false; |
| 225 | - } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 224 | + } elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) { |
|
| 226 | 225 | if ($debug) echo 'element : '.$element."\n"; |
| 227 | 226 | return false; |
| 228 | 227 | } |
@@ -235,14 +234,14 @@ discard block |
||
| 235 | 234 | */ |
| 236 | 235 | } |
| 237 | 236 | |
| 238 | - $type = substr($body,0,1); |
|
| 237 | + $type = substr($body, 0, 1); |
|
| 239 | 238 | if ($debug) echo 'type : '.$type."\n"; |
| 240 | 239 | if ($type == ';') { |
| 241 | 240 | if (isset($result['source_type']) && $result['source_type'] == 'modes') { |
| 242 | - $result['address'] = trim(substr($body,1,9)); |
|
| 241 | + $result['address'] = trim(substr($body, 1, 9)); |
|
| 243 | 242 | } elseif (isset($result['source_type']) && $result['source_type'] == 'ais') { |
| 244 | - $result['mmsi'] = trim(substr($body,1,9)); |
|
| 245 | - } else $result['ident'] = trim(substr($body,1,9)); |
|
| 243 | + $result['mmsi'] = trim(substr($body, 1, 9)); |
|
| 244 | + } else $result['ident'] = trim(substr($body, 1, 9)); |
|
| 246 | 245 | } elseif ($type == ',') { |
| 247 | 246 | // Invalid data or test data |
| 248 | 247 | return false; |
@@ -250,24 +249,24 @@ discard block |
||
| 250 | 249 | |
| 251 | 250 | // Check for Timestamp |
| 252 | 251 | $find = false; |
| 253 | - $body_parse = substr($body,1); |
|
| 252 | + $body_parse = substr($body, 1); |
|
| 254 | 253 | //echo 'Body : '.$body."\n"; |
| 255 | - if (preg_match('/^;(.){9}\*/',$body,$matches)) { |
|
| 256 | - $body_parse = substr($body_parse,10); |
|
| 254 | + if (preg_match('/^;(.){9}\*/', $body, $matches)) { |
|
| 255 | + $body_parse = substr($body_parse, 10); |
|
| 257 | 256 | $find = true; |
| 258 | 257 | //echo $body_parse."\n"; |
| 259 | 258 | } |
| 260 | - if (preg_match('/^`(.*)\//',$body,$matches)) { |
|
| 261 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 259 | + if (preg_match('/^`(.*)\//', $body, $matches)) { |
|
| 260 | + $body_parse = substr($body_parse, strlen($matches[1]) - 1); |
|
| 262 | 261 | $find = true; |
| 263 | 262 | //echo $body_parse."\n"; |
| 264 | 263 | } |
| 265 | - if (preg_match("/^'(.*)\//",$body,$matches)) { |
|
| 266 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 264 | + if (preg_match("/^'(.*)\//", $body, $matches)) { |
|
| 265 | + $body_parse = substr($body_parse, strlen($matches[1]) - 1); |
|
| 267 | 266 | $find = true; |
| 268 | 267 | //echo $body_parse."\n"; |
| 269 | 268 | } |
| 270 | - if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) { |
|
| 269 | + if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) { |
|
| 271 | 270 | $find = true; |
| 272 | 271 | //print_r($matches); |
| 273 | 272 | $timestamp = $matches[0]; |
@@ -282,19 +281,19 @@ discard block |
||
| 282 | 281 | // This work or not ? |
| 283 | 282 | $timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]); |
| 284 | 283 | } |
| 285 | - $body_parse = substr($body_parse,7); |
|
| 284 | + $body_parse = substr($body_parse, 7); |
|
| 286 | 285 | $result['timestamp'] = $timestamp; |
| 287 | 286 | //echo date('Ymd H:i:s',$timestamp); |
| 288 | 287 | } |
| 289 | - if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) { |
|
| 288 | + if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) { |
|
| 290 | 289 | $find = true; |
| 291 | 290 | $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
| 292 | - $body_parse = substr($body_parse,8); |
|
| 291 | + $body_parse = substr($body_parse, 8); |
|
| 293 | 292 | $result['timestamp'] = $timestamp; |
| 294 | 293 | //echo date('Ymd H:i:s',$timestamp); |
| 295 | 294 | } |
| 296 | 295 | //if (strlen($body_parse) > 19) { |
| 297 | - if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 296 | + if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) { |
|
| 298 | 297 | $find = true; |
| 299 | 298 | // 4658.70N/00707.78Ez |
| 300 | 299 | //print_r(str_split($body_parse)); |
@@ -321,11 +320,11 @@ discard block |
||
| 321 | 320 | */ |
| 322 | 321 | $latitude = $lat + floatval($lat_min)/60; |
| 323 | 322 | $longitude = $lon + floatval($lon_min)/60; |
| 324 | - if ($sind == 'S') $latitude = 0-$latitude; |
|
| 325 | - if ($wind == 'W') $longitude = 0-$longitude; |
|
| 323 | + if ($sind == 'S') $latitude = 0 - $latitude; |
|
| 324 | + if ($wind == 'W') $longitude = 0 - $longitude; |
|
| 326 | 325 | $result['latitude'] = $latitude; |
| 327 | 326 | $result['longitude'] = $longitude; |
| 328 | - $body_parse = substr($body_parse,18); |
|
| 327 | + $body_parse = substr($body_parse, 18); |
|
| 329 | 328 | $body_parse_len = strlen($body_parse); |
| 330 | 329 | } |
| 331 | 330 | $body_parse_len = strlen($body_parse); |
@@ -357,7 +356,7 @@ discard block |
||
| 357 | 356 | //echo $body_parse; |
| 358 | 357 | //if ($type != ';' && $type != '>') { |
| 359 | 358 | if ($type != '') { |
| 360 | - $body_parse = substr($body_parse,1); |
|
| 359 | + $body_parse = substr($body_parse, 1); |
|
| 361 | 360 | $body_parse_len = strlen($body_parse); |
| 362 | 361 | $result['symbol_code'] = $symbol_code; |
| 363 | 362 | if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
@@ -368,16 +367,16 @@ discard block |
||
| 368 | 367 | //$body_parse_len = strlen($body_parse); |
| 369 | 368 | if ($body_parse_len >= 7) { |
| 370 | 369 | |
| 371 | - if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 372 | - $course = substr($body_parse,0,3); |
|
| 370 | + if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) { |
|
| 371 | + $course = substr($body_parse, 0, 3); |
|
| 373 | 372 | $tmp_s = intval($course); |
| 374 | 373 | if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
| 375 | - $speed = substr($body_parse,4,3); |
|
| 374 | + $speed = substr($body_parse, 4, 3); |
|
| 376 | 375 | if ($speed != '...') { |
| 377 | 376 | //$result['speed'] = round($speed*1.852); |
| 378 | 377 | $result['speed'] = intval($speed); |
| 379 | 378 | } |
| 380 | - $body_parse = substr($body_parse,7); |
|
| 379 | + $body_parse = substr($body_parse, 7); |
|
| 381 | 380 | } |
| 382 | 381 | // Check PHGR, PHG, RNG |
| 383 | 382 | } |
@@ -387,12 +386,12 @@ discard block |
||
| 387 | 386 | } |
| 388 | 387 | */ |
| 389 | 388 | if (strlen($body_parse) > 0) { |
| 390 | - if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 389 | + if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) { |
|
| 391 | 390 | $altitude = intval($matches[1]); |
| 392 | 391 | //$result['altitude'] = round($altitude*0.3048); |
| 393 | 392 | $result['altitude'] = $altitude; |
| 394 | 393 | //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
| 395 | - $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 394 | + $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse)); |
|
| 396 | 395 | } |
| 397 | 396 | } |
| 398 | 397 | |
@@ -404,13 +403,13 @@ discard block |
||
| 404 | 403 | */ |
| 405 | 404 | // DAO |
| 406 | 405 | |
| 407 | - if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 406 | + if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) { |
|
| 408 | 407 | |
| 409 | 408 | $dao = $matches[1]; |
| 410 | - if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 409 | + if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) { |
|
| 411 | 410 | $dao_split = str_split($dao); |
| 412 | - $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 413 | - $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 411 | + $lat_off = (($dao_split[1]) - 48.0)*0.001/60.0; |
|
| 412 | + $lon_off = (($dao_split[2]) - 48.0)*0.001/60.0; |
|
| 414 | 413 | |
| 415 | 414 | if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
| 416 | 415 | else $result['latitude'] += $lat_off; |
@@ -418,50 +417,50 @@ discard block |
||
| 418 | 417 | else $result['longitude'] += $lon_off; |
| 419 | 418 | } |
| 420 | 419 | |
| 421 | - $body_parse = substr($body_parse,6); |
|
| 420 | + $body_parse = substr($body_parse, 6); |
|
| 422 | 421 | } |
| 423 | 422 | |
| 424 | - if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
| 425 | - $result['ident'] = str_replace('_',' ',$matches[1]); |
|
| 423 | + if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) { |
|
| 424 | + $result['ident'] = str_replace('_', ' ', $matches[1]); |
|
| 426 | 425 | } |
| 427 | - if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
| 426 | + if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) { |
|
| 428 | 427 | $result['squawk'] = $matches[1]; |
| 429 | 428 | } |
| 430 | - if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
| 429 | + if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) { |
|
| 431 | 430 | $result['aircraft_icao'] = $matches[1]; |
| 432 | 431 | } |
| 433 | - if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) { |
|
| 432 | + if (preg_match('/VR=([0-9]*)/', $body_parse, $matches)) { |
|
| 434 | 433 | $result['verticalrate'] = $matches[1]; |
| 435 | 434 | } |
| 436 | - if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
| 435 | + if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) { |
|
| 437 | 436 | $result['typeid'] = $matches[1]; |
| 438 | 437 | } |
| 439 | - if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) { |
|
| 438 | + if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) { |
|
| 440 | 439 | $result['statusid'] = $matches[1]; |
| 441 | 440 | } |
| 442 | - if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
| 441 | + if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) { |
|
| 443 | 442 | $result['imo'] = $matches[1]; |
| 444 | 443 | } |
| 445 | - if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
| 444 | + if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) { |
|
| 446 | 445 | $result['arrival_date'] = $matches[1]; |
| 447 | 446 | } |
| 448 | - if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
| 449 | - $result['arrival_code'] = str_replace('_',' ',$matches[1]); |
|
| 447 | + if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) { |
|
| 448 | + $result['arrival_code'] = str_replace('_', ' ', $matches[1]); |
|
| 450 | 449 | } |
| 451 | 450 | // OGN comment |
| 452 | 451 | // echo "Before OGN : ".$body_parse."\n"; |
| 453 | 452 | //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
| 454 | - if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 453 | + if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) { |
|
| 455 | 454 | $id = $matches[1]; |
| 456 | 455 | //$mode = substr($id,0,2); |
| 457 | - $address = substr($id,2); |
|
| 456 | + $address = substr($id, 2); |
|
| 458 | 457 | //print_r($matches); |
| 459 | - $addressType = (intval(substr($id,0,2),16))&3; |
|
| 458 | + $addressType = (intval(substr($id, 0, 2), 16))&3; |
|
| 460 | 459 | if ($addressType == 0) $result['addresstype'] = "RANDOM"; |
| 461 | 460 | elseif ($addressType == 1) $result['addresstype'] = "ICAO"; |
| 462 | 461 | elseif ($addressType == 2) $result['addresstype'] = "FLARM"; |
| 463 | 462 | elseif ($addressType == 3) $result['addresstype'] = "OGN"; |
| 464 | - $aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2); |
|
| 463 | + $aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2); |
|
| 465 | 464 | $result['aircrafttype_code'] = $aircraftType; |
| 466 | 465 | if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN"; |
| 467 | 466 | elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER"; |
@@ -478,7 +477,7 @@ discard block |
||
| 478 | 477 | elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP"; |
| 479 | 478 | elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV"; |
| 480 | 479 | elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT"; |
| 481 | - $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
|
| 480 | + $stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0; |
|
| 482 | 481 | $result['stealth'] = $stealth; |
| 483 | 482 | $result['address'] = $address; |
| 484 | 483 | } |
@@ -490,96 +489,96 @@ discard block |
||
| 490 | 489 | //$body_parse = substr($body_parse,1); |
| 491 | 490 | //$body_parse_len = strlen($body_parse); |
| 492 | 491 | //echo 'weather'."\n"; |
| 493 | - if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 492 | + if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 494 | 493 | $result['wind_dir'] = intval($matches[1]); |
| 495 | - $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 496 | - $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 497 | - $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 498 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 499 | - } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 494 | + $result['wind_speed'] = round(intval($matches[2])*1.60934, 1); |
|
| 495 | + $result['wind_gust'] = round(intval($matches[3])*1.60934, 1); |
|
| 496 | + $result['temp'] = round(5/9*((intval($matches[4])) - 32), 1); |
|
| 497 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 498 | + } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 500 | 499 | $result['wind_dir'] = intval($matches[1]); |
| 501 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 502 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 503 | - $result['temp'] = round(5/9*(($matches[4])-32),1); |
|
| 504 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 505 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 500 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 501 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 502 | + $result['temp'] = round(5/9*(($matches[4]) - 32), 1); |
|
| 503 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 504 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 506 | 505 | $result['wind_dir'] = intval($matches[1]); |
| 507 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 508 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 509 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 510 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 506 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 507 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 508 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 509 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 511 | 510 | $result['wind_dir'] = intval($matches[1]); |
| 512 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 513 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 514 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 511 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 512 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 513 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 515 | 514 | } |
| 516 | 515 | //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
| 517 | 516 | //g012t088r000p000P000h38b10110 |
| 518 | 517 | //g011t086r000p000P000h29b10198 |
| 519 | - if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 520 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 521 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 522 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 523 | - if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 524 | - if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
|
| 518 | + if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) { |
|
| 519 | + if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1); |
|
| 520 | + if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1); |
|
| 521 | + if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1); |
|
| 522 | + if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1); |
|
| 523 | + if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1); |
|
| 525 | 524 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
| 526 | - if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1); |
|
| 527 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 528 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 529 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 530 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 531 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 532 | - if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1); |
|
| 533 | - if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
|
| 525 | + if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1); |
|
| 526 | + $body_parse = substr($body_parse, strlen($matches[0])); |
|
| 527 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) { |
|
| 528 | + if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1); |
|
| 529 | + if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1); |
|
| 530 | + if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1); |
|
| 531 | + if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1, 1); |
|
| 532 | + if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1); |
|
| 534 | 533 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
| 535 | - if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1); |
|
| 536 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 537 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 538 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 539 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 540 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 541 | - if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 542 | - if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
|
| 534 | + if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1); |
|
| 535 | + $body_parse = substr($body_parse, strlen($matches[0])); |
|
| 536 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) { |
|
| 537 | + if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1); |
|
| 538 | + if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1); |
|
| 539 | + if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1); |
|
| 540 | + if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1); |
|
| 541 | + if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1); |
|
| 543 | 542 | if ($matches[7] != '...') $result['humidity'] = intval($matches[7]); |
| 544 | - if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1); |
|
| 545 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 546 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 547 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 548 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 549 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 550 | - if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
|
| 543 | + if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1); |
|
| 544 | + $body_parse = substr($body_parse, strlen($matches[0])); |
|
| 545 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) { |
|
| 546 | + if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1); |
|
| 547 | + if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1); |
|
| 548 | + if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1); |
|
| 549 | + if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1); |
|
| 551 | 550 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
| 552 | - if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 553 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 554 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
| 555 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 556 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 557 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 558 | - if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 551 | + if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1); |
|
| 552 | + $body_parse = substr($body_parse, strlen($matches[0])); |
|
| 553 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) { |
|
| 554 | + if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1); |
|
| 555 | + if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1); |
|
| 556 | + if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1); |
|
| 557 | + if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1); |
|
| 559 | 558 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
| 560 | - if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 561 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 562 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 563 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 564 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 565 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 566 | - if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 559 | + if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1); |
|
| 560 | + $body_parse = substr($body_parse, strlen($matches[0])); |
|
| 561 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) { |
|
| 562 | + if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1); |
|
| 563 | + if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1); |
|
| 564 | + if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1); |
|
| 565 | + if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1); |
|
| 567 | 566 | if ($matches[5] != '...') $result['humidity'] = intval($matches[5]); |
| 568 | - if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1); |
|
| 569 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 570 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 571 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 572 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 567 | + if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1); |
|
| 568 | + $body_parse = substr($body_parse, strlen($matches[0])); |
|
| 569 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) { |
|
| 570 | + if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1); |
|
| 571 | + if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1); |
|
| 573 | 572 | if ($matches[2] != '...') $result['humidity'] = intval($matches[3]); |
| 574 | - if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1); |
|
| 575 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 576 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
| 577 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 578 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 579 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 573 | + if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10), 1); |
|
| 574 | + $body_parse = substr($body_parse, strlen($matches[0])); |
|
| 575 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) { |
|
| 576 | + if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1); |
|
| 577 | + if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1); |
|
| 578 | + if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1); |
|
| 580 | 579 | if ($matches[4] != '...') $result['humidity'] = intval($matches[4]); |
| 581 | - if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 582 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
| 580 | + if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1); |
|
| 581 | + $body_parse = substr($body_parse, strlen($matches[0])); |
|
| 583 | 582 | } |
| 584 | 583 | $result['comment'] = trim($body_parse); |
| 585 | 584 | } |
@@ -587,42 +586,42 @@ discard block |
||
| 587 | 586 | |
| 588 | 587 | } |
| 589 | 588 | //} |
| 590 | - if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
|
| 591 | - if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
|
| 589 | + if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4); |
|
| 590 | + if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4); |
|
| 592 | 591 | if ($debug) print_r($result); |
| 593 | 592 | return $result; |
| 594 | 593 | } |
| 595 | 594 | |
| 596 | 595 | public function connect() { |
| 597 | - global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport; |
|
| 596 | + global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport; |
|
| 598 | 597 | $aprs_connect = 0; |
| 599 | 598 | $aprs_keep = 120; |
| 600 | 599 | $aprs_last_tx = time(); |
| 601 | 600 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 602 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 601 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 603 | 602 | if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid; |
| 604 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 603 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 605 | 604 | if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass; |
| 606 | 605 | else $aprs_pass = '-1'; |
| 607 | 606 | |
| 608 | - $aprs_filter = ''; |
|
| 607 | + $aprs_filter = ''; |
|
| 609 | 608 | $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
| 610 | 609 | $Common = new Common(); |
| 611 | - $s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr); |
|
| 610 | + $s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr); |
|
| 612 | 611 | if ($s !== false) { |
| 613 | 612 | echo 'Connected to APRS server! '."\n"; |
| 614 | 613 | $authstart = time(); |
| 615 | 614 | $this->socket = $s; |
| 616 | - $send = socket_send( $this->socket , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 617 | - socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1); |
|
| 618 | - while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) { |
|
| 615 | + $send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0); |
|
| 616 | + socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1); |
|
| 617 | + while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) { |
|
| 619 | 618 | if (strpos($msgin, "$aprs_ssid verified") !== FALSE) { |
| 620 | 619 | echo 'APRS user verified !'."\n"; |
| 621 | 620 | $this->connected = true; |
| 622 | 621 | return true; |
| 623 | 622 | break; |
| 624 | 623 | } |
| 625 | - if (time()-$authstart > 5) { |
|
| 624 | + if (time() - $authstart > 5) { |
|
| 626 | 625 | echo 'APRS timeout'."\n"; |
| 627 | 626 | break; |
| 628 | 627 | } |
@@ -637,7 +636,7 @@ discard block |
||
| 637 | 636 | public function send($data) { |
| 638 | 637 | global $globalDebug; |
| 639 | 638 | if ($this->connected === false) $this->connect(); |
| 640 | - $send = socket_send( $this->socket , $data , strlen($data),0); |
|
| 639 | + $send = socket_send($this->socket, $data, strlen($data), 0); |
|
| 641 | 640 | if ($send === FALSE) { |
| 642 | 641 | if ($globalDebug) echo 'Reconnect...'; |
| 643 | 642 | socket_close($this->socket); |
@@ -647,16 +646,16 @@ discard block |
||
| 647 | 646 | } |
| 648 | 647 | |
| 649 | 648 | class APRSSpotter extends APRS { |
| 650 | - public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) { |
|
| 649 | + public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) { |
|
| 651 | 650 | $Common = new Common(); |
| 652 | 651 | if ($latitude != '' && $longitude != '') { |
| 653 | 652 | $lat = $latitude; |
| 654 | 653 | $long = $longitude; |
| 655 | - $latitude = $Common->convertDM($latitude,'latitude'); |
|
| 656 | - $longitude = $Common->convertDM($longitude,'longitude'); |
|
| 657 | - $coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW']; |
|
| 658 | - $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000)); |
|
| 659 | - $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000)); |
|
| 654 | + $latitude = $Common->convertDM($latitude, 'latitude'); |
|
| 655 | + $longitude = $Common->convertDM($longitude, 'longitude'); |
|
| 656 | + $coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW']; |
|
| 657 | + $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000)); |
|
| 658 | + $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000)); |
|
| 660 | 659 | $w = $w1.$w2; |
| 661 | 660 | //$w = '00'; |
| 662 | 661 | $custom = ''; |
@@ -683,25 +682,25 @@ discard block |
||
| 683 | 682 | $geoid= round($GeoidClass->get($lat,$long)*3.28084,2); |
| 684 | 683 | $altitude_real = round($altitude_real + $geoid); |
| 685 | 684 | */ |
| 686 | - $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 685 | + $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 687 | 686 | } |
| 688 | 687 | } |
| 689 | 688 | } |
| 690 | 689 | class APRSMarine extends APRS { |
| 691 | - public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source,$source_name,$over_country) { |
|
| 690 | + public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $statusid, $noarchive, $format_source, $source_name, $over_country) { |
|
| 692 | 691 | $Common = new Common(); |
| 693 | 692 | if ($latitude != '' && $longitude != '') { |
| 694 | - $latitude = $Common->convertDM($latitude,'latitude'); |
|
| 695 | - $longitude = $Common->convertDM($longitude,'longitude'); |
|
| 696 | - $coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW']; |
|
| 697 | - $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000)); |
|
| 698 | - $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000)); |
|
| 693 | + $latitude = $Common->convertDM($latitude, 'latitude'); |
|
| 694 | + $longitude = $Common->convertDM($longitude, 'longitude'); |
|
| 695 | + $coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW']; |
|
| 696 | + $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000)); |
|
| 697 | + $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000)); |
|
| 699 | 698 | $w = $w1.$w2; |
| 700 | 699 | //$w = '00'; |
| 701 | 700 | $custom = ''; |
| 702 | 701 | if ($ident != '') { |
| 703 | 702 | if ($custom != '') $custom .= '/'; |
| 704 | - $custom .= 'CS='.str_replace(' ','_',$ident); |
|
| 703 | + $custom .= 'CS='.str_replace(' ', '_', $ident); |
|
| 705 | 704 | } |
| 706 | 705 | if ($typeid != '') { |
| 707 | 706 | if ($custom != '') $custom .= '/'; |
@@ -721,11 +720,11 @@ discard block |
||
| 721 | 720 | } |
| 722 | 721 | if ($arrival_code != '') { |
| 723 | 722 | if ($custom != '') $custom .= '/'; |
| 724 | - $custom .= 'AC='.str_replace(' ','_',$arrival_code); |
|
| 723 | + $custom .= 'AC='.str_replace(' ', '_', $arrival_code); |
|
| 725 | 724 | } |
| 726 | 725 | if ($custom != '') $custom = ' '.$custom; |
| 727 | 726 | $altitude = 0; |
| 728 | - $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 727 | + $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 729 | 728 | } |
| 730 | 729 | } |
| 731 | 730 | } |
@@ -184,17 +184,23 @@ discard block |
||
| 184 | 184 | |
| 185 | 185 | /* Check that end was found and body has at least one byte. */ |
| 186 | 186 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
| 187 | - if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
| 187 | + if ($globalDebug) { |
|
| 188 | + echo '!!! APRS invalid : '.$input."\n"; |
|
| 189 | + } |
|
| 188 | 190 | return false; |
| 189 | 191 | } |
| 190 | 192 | |
| 191 | - if ($debug) echo 'input : '.$input."\n"; |
|
| 193 | + if ($debug) { |
|
| 194 | + echo 'input : '.$input."\n"; |
|
| 195 | + } |
|
| 192 | 196 | /* Save header and body. */ |
| 193 | 197 | $body = substr($input,$splitpos+1,$input_len); |
| 194 | 198 | $body_len = strlen($body); |
| 195 | 199 | $header = substr($input,0,$splitpos); |
| 196 | 200 | //$header_len = strlen($header); |
| 197 | - if ($debug) echo 'header : '.$header."\n"; |
|
| 201 | + if ($debug) { |
|
| 202 | + echo 'header : '.$header."\n"; |
|
| 203 | + } |
|
| 198 | 204 | |
| 199 | 205 | /* Parse source, target and path. */ |
| 200 | 206 | //FLRDF0A52>APRS,qAS,LSTB |
@@ -208,11 +214,15 @@ discard block |
||
| 208 | 214 | $result['format_source'] = 'famaprs'; |
| 209 | 215 | $result['source_type'] = 'ais'; |
| 210 | 216 | } else { |
| 211 | - if ($debug) echo 'ident : '.$ident."\n"; |
|
| 217 | + if ($debug) { |
|
| 218 | + echo 'ident : '.$ident."\n"; |
|
| 219 | + } |
|
| 212 | 220 | $result['ident'] = $ident; |
| 213 | 221 | } |
| 214 | 222 | } else { |
| 215 | - if ($debug) 'No ident'."\n"; |
|
| 223 | + if ($debug) { |
|
| 224 | + 'No ident'."\n"; |
|
| 225 | + } |
|
| 216 | 226 | return false; |
| 217 | 227 | } |
| 218 | 228 | $elements = explode(',',$all_elements); |
@@ -223,7 +233,9 @@ discard block |
||
| 223 | 233 | //echo "ok"; |
| 224 | 234 | //if ($element == 'TCPIP*') return false; |
| 225 | 235 | } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
| 226 | - if ($debug) echo 'element : '.$element."\n"; |
|
| 236 | + if ($debug) { |
|
| 237 | + echo 'element : '.$element."\n"; |
|
| 238 | + } |
|
| 227 | 239 | return false; |
| 228 | 240 | } |
| 229 | 241 | /* |
@@ -236,13 +248,17 @@ discard block |
||
| 236 | 248 | } |
| 237 | 249 | |
| 238 | 250 | $type = substr($body,0,1); |
| 239 | - if ($debug) echo 'type : '.$type."\n"; |
|
| 251 | + if ($debug) { |
|
| 252 | + echo 'type : '.$type."\n"; |
|
| 253 | + } |
|
| 240 | 254 | if ($type == ';') { |
| 241 | 255 | if (isset($result['source_type']) && $result['source_type'] == 'modes') { |
| 242 | 256 | $result['address'] = trim(substr($body,1,9)); |
| 243 | 257 | } elseif (isset($result['source_type']) && $result['source_type'] == 'ais') { |
| 244 | 258 | $result['mmsi'] = trim(substr($body,1,9)); |
| 245 | - } else $result['ident'] = trim(substr($body,1,9)); |
|
| 259 | + } else { |
|
| 260 | + $result['ident'] = trim(substr($body,1,9)); |
|
| 261 | + } |
|
| 246 | 262 | } elseif ($type == ',') { |
| 247 | 263 | // Invalid data or test data |
| 248 | 264 | return false; |
@@ -311,7 +327,9 @@ discard block |
||
| 311 | 327 | //$symbol_table = $matches[4]; |
| 312 | 328 | $lat = intval($lat_deg); |
| 313 | 329 | $lon = intval($lon_deg); |
| 314 | - if ($lat > 89 || $lon > 179) return false; |
|
| 330 | + if ($lat > 89 || $lon > 179) { |
|
| 331 | + return false; |
|
| 332 | + } |
|
| 315 | 333 | |
| 316 | 334 | /* |
| 317 | 335 | $tmp_5b = str_replace('.','',$lat_min); |
@@ -321,8 +339,12 @@ discard block |
||
| 321 | 339 | */ |
| 322 | 340 | $latitude = $lat + floatval($lat_min)/60; |
| 323 | 341 | $longitude = $lon + floatval($lon_min)/60; |
| 324 | - if ($sind == 'S') $latitude = 0-$latitude; |
|
| 325 | - if ($wind == 'W') $longitude = 0-$longitude; |
|
| 342 | + if ($sind == 'S') { |
|
| 343 | + $latitude = 0-$latitude; |
|
| 344 | + } |
|
| 345 | + if ($wind == 'W') { |
|
| 346 | + $longitude = 0-$longitude; |
|
| 347 | + } |
|
| 326 | 348 | $result['latitude'] = $latitude; |
| 327 | 349 | $result['longitude'] = $longitude; |
| 328 | 350 | $body_parse = substr($body_parse,18); |
@@ -350,8 +372,11 @@ discard block |
||
| 350 | 372 | //echo 'find'."\n"; |
| 351 | 373 | $body_split = str_split($body_parse); |
| 352 | 374 | $symbol_code = $body_split[0]; |
| 353 | - if (!isset($symbolll) || $symbolll == '/') $symbol_code = '/'.$symbol_code; |
|
| 354 | - else $symbol_code = '\\'.$symbol_code; |
|
| 375 | + if (!isset($symbolll) || $symbolll == '/') { |
|
| 376 | + $symbol_code = '/'.$symbol_code; |
|
| 377 | + } else { |
|
| 378 | + $symbol_code = '\\'.$symbol_code; |
|
| 379 | + } |
|
| 355 | 380 | //' |
| 356 | 381 | //} |
| 357 | 382 | //echo $body_parse; |
@@ -360,7 +385,9 @@ discard block |
||
| 360 | 385 | $body_parse = substr($body_parse,1); |
| 361 | 386 | $body_parse_len = strlen($body_parse); |
| 362 | 387 | $result['symbol_code'] = $symbol_code; |
| 363 | - if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
|
| 388 | + if (isset($this->symbols[$symbol_code])) { |
|
| 389 | + $result['symbol'] = $this->symbols[$symbol_code]; |
|
| 390 | + } |
|
| 364 | 391 | if ($symbol_code != '_') { |
| 365 | 392 | } |
| 366 | 393 | //$body_parse = substr($body_parse,1); |
@@ -371,7 +398,9 @@ discard block |
||
| 371 | 398 | if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
| 372 | 399 | $course = substr($body_parse,0,3); |
| 373 | 400 | $tmp_s = intval($course); |
| 374 | - if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
| 401 | + if ($tmp_s >= 1 && $tmp_s <= 360) { |
|
| 402 | + $result['heading'] = intval($course); |
|
| 403 | + } |
|
| 375 | 404 | $speed = substr($body_parse,4,3); |
| 376 | 405 | if ($speed != '...') { |
| 377 | 406 | //$result['speed'] = round($speed*1.852); |
@@ -412,10 +441,16 @@ discard block |
||
| 412 | 441 | $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
| 413 | 442 | $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
| 414 | 443 | |
| 415 | - if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
|
| 416 | - else $result['latitude'] += $lat_off; |
|
| 417 | - if ($result['longitude'] < 0) $result['longitude'] -= $lon_off; |
|
| 418 | - else $result['longitude'] += $lon_off; |
|
| 444 | + if ($result['latitude'] < 0) { |
|
| 445 | + $result['latitude'] -= $lat_off; |
|
| 446 | + } else { |
|
| 447 | + $result['latitude'] += $lat_off; |
|
| 448 | + } |
|
| 449 | + if ($result['longitude'] < 0) { |
|
| 450 | + $result['longitude'] -= $lon_off; |
|
| 451 | + } else { |
|
| 452 | + $result['longitude'] += $lon_off; |
|
| 453 | + } |
|
| 419 | 454 | } |
| 420 | 455 | |
| 421 | 456 | $body_parse = substr($body_parse,6); |
@@ -457,27 +492,48 @@ discard block |
||
| 457 | 492 | $address = substr($id,2); |
| 458 | 493 | //print_r($matches); |
| 459 | 494 | $addressType = (intval(substr($id,0,2),16))&3; |
| 460 | - if ($addressType == 0) $result['addresstype'] = "RANDOM"; |
|
| 461 | - elseif ($addressType == 1) $result['addresstype'] = "ICAO"; |
|
| 462 | - elseif ($addressType == 2) $result['addresstype'] = "FLARM"; |
|
| 463 | - elseif ($addressType == 3) $result['addresstype'] = "OGN"; |
|
| 495 | + if ($addressType == 0) { |
|
| 496 | + $result['addresstype'] = "RANDOM"; |
|
| 497 | + } elseif ($addressType == 1) { |
|
| 498 | + $result['addresstype'] = "ICAO"; |
|
| 499 | + } elseif ($addressType == 2) { |
|
| 500 | + $result['addresstype'] = "FLARM"; |
|
| 501 | + } elseif ($addressType == 3) { |
|
| 502 | + $result['addresstype'] = "OGN"; |
|
| 503 | + } |
|
| 464 | 504 | $aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2); |
| 465 | 505 | $result['aircrafttype_code'] = $aircraftType; |
| 466 | - if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN"; |
|
| 467 | - elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER"; |
|
| 468 | - elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE"; |
|
| 469 | - elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT"; |
|
| 470 | - elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE"; |
|
| 471 | - elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE"; |
|
| 472 | - elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER"; |
|
| 473 | - elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER"; |
|
| 474 | - elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT"; |
|
| 475 | - elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT"; |
|
| 476 | - elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO"; |
|
| 477 | - elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON"; |
|
| 478 | - elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP"; |
|
| 479 | - elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV"; |
|
| 480 | - elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT"; |
|
| 506 | + if ($aircraftType == 0) { |
|
| 507 | + $result['aircrafttype'] = "UNKNOWN"; |
|
| 508 | + } elseif ($aircraftType == 1) { |
|
| 509 | + $result['aircrafttype'] = "GLIDER"; |
|
| 510 | + } elseif ($aircraftType == 2) { |
|
| 511 | + $result['aircrafttype'] = "TOW_PLANE"; |
|
| 512 | + } elseif ($aircraftType == 3) { |
|
| 513 | + $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT"; |
|
| 514 | + } elseif ($aircraftType == 4) { |
|
| 515 | + $result['aircrafttype'] = "PARACHUTE"; |
|
| 516 | + } elseif ($aircraftType == 5) { |
|
| 517 | + $result['aircrafttype'] = "DROP_PLANE"; |
|
| 518 | + } elseif ($aircraftType == 6) { |
|
| 519 | + $result['aircrafttype'] = "HANG_GLIDER"; |
|
| 520 | + } elseif ($aircraftType == 7) { |
|
| 521 | + $result['aircrafttype'] = "PARA_GLIDER"; |
|
| 522 | + } elseif ($aircraftType == 8) { |
|
| 523 | + $result['aircrafttype'] = "POWERED_AIRCRAFT"; |
|
| 524 | + } elseif ($aircraftType == 9) { |
|
| 525 | + $result['aircrafttype'] = "JET_AIRCRAFT"; |
|
| 526 | + } elseif ($aircraftType == 10) { |
|
| 527 | + $result['aircrafttype'] = "UFO"; |
|
| 528 | + } elseif ($aircraftType == 11) { |
|
| 529 | + $result['aircrafttype'] = "BALLOON"; |
|
| 530 | + } elseif ($aircraftType == 12) { |
|
| 531 | + $result['aircrafttype'] = "AIRSHIP"; |
|
| 532 | + } elseif ($aircraftType == 13) { |
|
| 533 | + $result['aircrafttype'] = "UAV"; |
|
| 534 | + } elseif ($aircraftType == 15) { |
|
| 535 | + $result['aircrafttype'] = "STATIC_OBJECT"; |
|
| 536 | + } |
|
| 481 | 537 | $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
| 482 | 538 | $result['stealth'] = $stealth; |
| 483 | 539 | $result['address'] = $address; |
@@ -517,79 +573,183 @@ discard block |
||
| 517 | 573 | //g012t088r000p000P000h38b10110 |
| 518 | 574 | //g011t086r000p000P000h29b10198 |
| 519 | 575 | if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
| 520 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 521 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 522 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 523 | - if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 524 | - if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
|
| 525 | - if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
|
| 526 | - if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1); |
|
| 576 | + if ($matches[1] != '...') { |
|
| 577 | + $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 578 | + } |
|
| 579 | + if ($matches[2] != '...') { |
|
| 580 | + $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 581 | + } |
|
| 582 | + if ($matches[3] != '...') { |
|
| 583 | + $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 584 | + } |
|
| 585 | + if ($matches[4] != '...') { |
|
| 586 | + $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 587 | + } |
|
| 588 | + if ($matches[5] != '...') { |
|
| 589 | + $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
|
| 590 | + } |
|
| 591 | + if ($matches[6] != '...') { |
|
| 592 | + $result['humidity'] = intval($matches[6]); |
|
| 593 | + } |
|
| 594 | + if ($matches[7] != '...') { |
|
| 595 | + $result['pressure'] = round((intval($matches[7])/10),1); |
|
| 596 | + } |
|
| 527 | 597 | $body_parse = substr($body_parse,strlen($matches[0])); |
| 528 | 598 | } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
| 529 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 530 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 531 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 532 | - if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1); |
|
| 533 | - if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
|
| 534 | - if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
|
| 535 | - if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1); |
|
| 599 | + if ($matches[1] != '...') { |
|
| 600 | + $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 601 | + } |
|
| 602 | + if ($matches[2] != '...') { |
|
| 603 | + $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 604 | + } |
|
| 605 | + if ($matches[3] != '...') { |
|
| 606 | + $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 607 | + } |
|
| 608 | + if ($matches[5] != '...') { |
|
| 609 | + $result['precipitation'] = round((intval($matches[5])/100)*25.1,1); |
|
| 610 | + } |
|
| 611 | + if ($matches[4] != '...') { |
|
| 612 | + $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
|
| 613 | + } |
|
| 614 | + if ($matches[6] != '...') { |
|
| 615 | + $result['humidity'] = intval($matches[6]); |
|
| 616 | + } |
|
| 617 | + if ($matches[7] != '...') { |
|
| 618 | + $result['pressure'] = round((intval($matches[7])/10),1); |
|
| 619 | + } |
|
| 536 | 620 | $body_parse = substr($body_parse,strlen($matches[0])); |
| 537 | 621 | } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
| 538 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 539 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 540 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 541 | - if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 542 | - if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
|
| 543 | - if ($matches[7] != '...') $result['humidity'] = intval($matches[7]); |
|
| 544 | - if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1); |
|
| 622 | + if ($matches[1] != '...') { |
|
| 623 | + $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 624 | + } |
|
| 625 | + if ($matches[2] != '...') { |
|
| 626 | + $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 627 | + } |
|
| 628 | + if ($matches[3] != '...') { |
|
| 629 | + $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 630 | + } |
|
| 631 | + if ($matches[4] != '...') { |
|
| 632 | + $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 633 | + } |
|
| 634 | + if ($matches[5] != '...') { |
|
| 635 | + $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
|
| 636 | + } |
|
| 637 | + if ($matches[7] != '...') { |
|
| 638 | + $result['humidity'] = intval($matches[7]); |
|
| 639 | + } |
|
| 640 | + if ($matches[6] != '...') { |
|
| 641 | + $result['pressure'] = round((intval($matches[6])/10),1); |
|
| 642 | + } |
|
| 545 | 643 | $body_parse = substr($body_parse,strlen($matches[0])); |
| 546 | 644 | } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
| 547 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 548 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 549 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 550 | - if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
|
| 551 | - if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
|
| 552 | - if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 645 | + if ($matches[1] != '...') { |
|
| 646 | + $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 647 | + } |
|
| 648 | + if ($matches[2] != '...') { |
|
| 649 | + $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 650 | + } |
|
| 651 | + if ($matches[3] != '...') { |
|
| 652 | + $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 653 | + } |
|
| 654 | + if ($matches[4] != '...') { |
|
| 655 | + $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
|
| 656 | + } |
|
| 657 | + if ($matches[6] != '...') { |
|
| 658 | + $result['humidity'] = intval($matches[6]); |
|
| 659 | + } |
|
| 660 | + if ($matches[5] != '...') { |
|
| 661 | + $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 662 | + } |
|
| 553 | 663 | $body_parse = substr($body_parse,strlen($matches[0])); |
| 554 | 664 | } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
| 555 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 556 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 557 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 558 | - if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 559 | - if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
|
| 560 | - if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 665 | + if ($matches[1] != '...') { |
|
| 666 | + $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 667 | + } |
|
| 668 | + if ($matches[2] != '...') { |
|
| 669 | + $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 670 | + } |
|
| 671 | + if ($matches[3] != '...') { |
|
| 672 | + $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 673 | + } |
|
| 674 | + if ($matches[4] != '...') { |
|
| 675 | + $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 676 | + } |
|
| 677 | + if ($matches[6] != '...') { |
|
| 678 | + $result['humidity'] = intval($matches[6]); |
|
| 679 | + } |
|
| 680 | + if ($matches[5] != '...') { |
|
| 681 | + $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 682 | + } |
|
| 561 | 683 | $body_parse = substr($body_parse,strlen($matches[0])); |
| 562 | 684 | } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
| 563 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 564 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 565 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 566 | - if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 567 | - if ($matches[5] != '...') $result['humidity'] = intval($matches[5]); |
|
| 568 | - if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1); |
|
| 685 | + if ($matches[1] != '...') { |
|
| 686 | + $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 687 | + } |
|
| 688 | + if ($matches[2] != '...') { |
|
| 689 | + $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 690 | + } |
|
| 691 | + if ($matches[3] != '...') { |
|
| 692 | + $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 693 | + } |
|
| 694 | + if ($matches[4] != '...') { |
|
| 695 | + $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
|
| 696 | + } |
|
| 697 | + if ($matches[5] != '...') { |
|
| 698 | + $result['humidity'] = intval($matches[5]); |
|
| 699 | + } |
|
| 700 | + if ($matches[6] != '...') { |
|
| 701 | + $result['pressure'] = round((intval($matches[6])/10),1); |
|
| 702 | + } |
|
| 569 | 703 | $body_parse = substr($body_parse,strlen($matches[0])); |
| 570 | 704 | } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
| 571 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 572 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 573 | - if ($matches[2] != '...') $result['humidity'] = intval($matches[3]); |
|
| 574 | - if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1); |
|
| 705 | + if ($matches[1] != '...') { |
|
| 706 | + $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 707 | + } |
|
| 708 | + if ($matches[2] != '...') { |
|
| 709 | + $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 710 | + } |
|
| 711 | + if ($matches[2] != '...') { |
|
| 712 | + $result['humidity'] = intval($matches[3]); |
|
| 713 | + } |
|
| 714 | + if ($matches[4] != '...') { |
|
| 715 | + $result['pressure'] = round((intval($matches[4])/10),1); |
|
| 716 | + } |
|
| 575 | 717 | $body_parse = substr($body_parse,strlen($matches[0])); |
| 576 | 718 | } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
| 577 | - if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 578 | - if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 579 | - if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 580 | - if ($matches[4] != '...') $result['humidity'] = intval($matches[4]); |
|
| 581 | - if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 719 | + if ($matches[1] != '...') { |
|
| 720 | + $result['wind_gust'] = round($matches[1]*1.60934,1); |
|
| 721 | + } |
|
| 722 | + if ($matches[2] != '...') { |
|
| 723 | + $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
|
| 724 | + } |
|
| 725 | + if ($matches[3] != '...') { |
|
| 726 | + $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
|
| 727 | + } |
|
| 728 | + if ($matches[4] != '...') { |
|
| 729 | + $result['humidity'] = intval($matches[4]); |
|
| 730 | + } |
|
| 731 | + if ($matches[5] != '...') { |
|
| 732 | + $result['pressure'] = round((intval($matches[5])/10),1); |
|
| 733 | + } |
|
| 582 | 734 | $body_parse = substr($body_parse,strlen($matches[0])); |
| 583 | 735 | } |
| 584 | 736 | $result['comment'] = trim($body_parse); |
| 585 | 737 | } |
| 586 | - } else $result['comment'] = trim($body_parse); |
|
| 738 | + } else { |
|
| 739 | + $result['comment'] = trim($body_parse); |
|
| 740 | + } |
|
| 587 | 741 | |
| 588 | 742 | } |
| 589 | 743 | //} |
| 590 | - if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
|
| 591 | - if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
|
| 592 | - if ($debug) print_r($result); |
|
| 744 | + if (isset($result['latitude'])) { |
|
| 745 | + $result['latitude'] = round($result['latitude'],4); |
|
| 746 | + } |
|
| 747 | + if (isset($result['longitude'])) { |
|
| 748 | + $result['longitude'] = round($result['longitude'],4); |
|
| 749 | + } |
|
| 750 | + if ($debug) { |
|
| 751 | + print_r($result); |
|
| 752 | + } |
|
| 593 | 753 | return $result; |
| 594 | 754 | } |
| 595 | 755 | |
@@ -598,12 +758,21 @@ discard block |
||
| 598 | 758 | $aprs_connect = 0; |
| 599 | 759 | $aprs_keep = 120; |
| 600 | 760 | $aprs_last_tx = time(); |
| 601 | - if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
|
| 602 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 603 | - if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid; |
|
| 604 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 605 | - if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass; |
|
| 606 | - else $aprs_pass = '-1'; |
|
| 761 | + if (isset($globalAPRSversion)) { |
|
| 762 | + $aprs_version = $globalAPRSversion; |
|
| 763 | + } else { |
|
| 764 | + $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 765 | + } |
|
| 766 | + if (isset($globalServerAPRSssid)) { |
|
| 767 | + $aprs_ssid = $globalServerAPRSssid; |
|
| 768 | + } else { |
|
| 769 | + $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 770 | + } |
|
| 771 | + if (isset($globalServerAPRSpass)) { |
|
| 772 | + $aprs_pass = $globalServerAPRSpass; |
|
| 773 | + } else { |
|
| 774 | + $aprs_pass = '-1'; |
|
| 775 | + } |
|
| 607 | 776 | |
| 608 | 777 | $aprs_filter = ''; |
| 609 | 778 | $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
@@ -636,10 +805,14 @@ discard block |
||
| 636 | 805 | |
| 637 | 806 | public function send($data) { |
| 638 | 807 | global $globalDebug; |
| 639 | - if ($this->connected === false) $this->connect(); |
|
| 808 | + if ($this->connected === false) { |
|
| 809 | + $this->connect(); |
|
| 810 | + } |
|
| 640 | 811 | $send = socket_send( $this->socket , $data , strlen($data),0); |
| 641 | 812 | if ($send === FALSE) { |
| 642 | - if ($globalDebug) echo 'Reconnect...'; |
|
| 813 | + if ($globalDebug) { |
|
| 814 | + echo 'Reconnect...'; |
|
| 815 | + } |
|
| 643 | 816 | socket_close($this->socket); |
| 644 | 817 | $this->connect(); |
| 645 | 818 | } |
@@ -661,22 +834,32 @@ discard block |
||
| 661 | 834 | //$w = '00'; |
| 662 | 835 | $custom = ''; |
| 663 | 836 | if ($ident != '') { |
| 664 | - if ($custom != '') $custom .= '/'; |
|
| 837 | + if ($custom != '') { |
|
| 838 | + $custom .= '/'; |
|
| 839 | + } |
|
| 665 | 840 | $custom .= 'CS='.$ident; |
| 666 | 841 | } |
| 667 | 842 | if ($squawk != '') { |
| 668 | - if ($custom != '') $custom .= '/'; |
|
| 843 | + if ($custom != '') { |
|
| 844 | + $custom .= '/'; |
|
| 845 | + } |
|
| 669 | 846 | $custom .= 'SQ='.$squawk; |
| 670 | 847 | } |
| 671 | 848 | if ($verticalrate != '') { |
| 672 | - if ($custom != '') $custom .= '/'; |
|
| 849 | + if ($custom != '') { |
|
| 850 | + $custom .= '/'; |
|
| 851 | + } |
|
| 673 | 852 | $custom .= 'VR='.$verticalrate; |
| 674 | 853 | } |
| 675 | 854 | if ($aircraft_icao != '' && $aircraft_icao != 'NA') { |
| 676 | - if ($custom != '') $custom .= '/'; |
|
| 855 | + if ($custom != '') { |
|
| 856 | + $custom .= '/'; |
|
| 857 | + } |
|
| 677 | 858 | $custom .= 'AI='.$aircraft_icao; |
| 678 | 859 | } |
| 679 | - if ($custom != '') $custom = ' '.$custom; |
|
| 860 | + if ($custom != '') { |
|
| 861 | + $custom = ' '.$custom; |
|
| 862 | + } |
|
| 680 | 863 | /* |
| 681 | 864 | // Use AMSL altitude |
| 682 | 865 | $GeoidClass = new GeoidHeight(); |
@@ -700,30 +883,44 @@ discard block |
||
| 700 | 883 | //$w = '00'; |
| 701 | 884 | $custom = ''; |
| 702 | 885 | if ($ident != '') { |
| 703 | - if ($custom != '') $custom .= '/'; |
|
| 886 | + if ($custom != '') { |
|
| 887 | + $custom .= '/'; |
|
| 888 | + } |
|
| 704 | 889 | $custom .= 'CS='.str_replace(' ','_',$ident); |
| 705 | 890 | } |
| 706 | 891 | if ($typeid != '') { |
| 707 | - if ($custom != '') $custom .= '/'; |
|
| 892 | + if ($custom != '') { |
|
| 893 | + $custom .= '/'; |
|
| 894 | + } |
|
| 708 | 895 | $custom .= 'TI='.$typeid; |
| 709 | 896 | } |
| 710 | 897 | if ($statusid != '') { |
| 711 | - if ($custom != '') $custom .= '/'; |
|
| 898 | + if ($custom != '') { |
|
| 899 | + $custom .= '/'; |
|
| 900 | + } |
|
| 712 | 901 | $custom .= 'SI='.$statusid; |
| 713 | 902 | } |
| 714 | 903 | if ($imo != '') { |
| 715 | - if ($custom != '') $custom .= '/'; |
|
| 904 | + if ($custom != '') { |
|
| 905 | + $custom .= '/'; |
|
| 906 | + } |
|
| 716 | 907 | $custom .= 'IMO='.$imo; |
| 717 | 908 | } |
| 718 | 909 | if ($arrival_date != '') { |
| 719 | - if ($custom != '') $custom .= '/'; |
|
| 910 | + if ($custom != '') { |
|
| 911 | + $custom .= '/'; |
|
| 912 | + } |
|
| 720 | 913 | $custom .= 'AD='.strtotime($arrival_date); |
| 721 | 914 | } |
| 722 | 915 | if ($arrival_code != '') { |
| 723 | - if ($custom != '') $custom .= '/'; |
|
| 916 | + if ($custom != '') { |
|
| 917 | + $custom .= '/'; |
|
| 918 | + } |
|
| 724 | 919 | $custom .= 'AC='.str_replace(' ','_',$arrival_code); |
| 725 | 920 | } |
| 726 | - if ($custom != '') $custom = ' '.$custom; |
|
| 921 | + if ($custom != '') { |
|
| 922 | + $custom = ' '.$custom; |
|
| 923 | + } |
|
| 727 | 924 | $altitude = 0; |
| 728 | 925 | $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
| 729 | 926 | } |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | /** |
| 15 | 15 | * Get SQL query part for filter used |
| 16 | 16 | * @param Array $filter the filter |
| 17 | - * @return Array the SQL part |
|
| 17 | + * @return string the SQL part |
|
| 18 | 18 | */ |
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
@@ -10,10 +10,10 @@ |
||
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | - * Get SQL query part for filter used |
|
| 14 | - * @param Array $filter the filter |
|
| 15 | - * @return Array the SQL part |
|
| 16 | - */ |
|
| 13 | + * Get SQL query part for filter used |
|
| 14 | + * @param Array $filter the filter |
|
| 15 | + * @return Array the SQL part |
|
| 16 | + */ |
|
| 17 | 17 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
@@ -14,22 +14,22 @@ discard block |
||
| 14 | 14 | * @param Array $filter the filter |
| 15 | 15 | * @return Array the SQL part |
| 16 | 16 | */ |
| 17 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 20 | 20 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 21 | - foreach($globalStatsFilters[$globalFilterName] as $source) { |
|
| 21 | + foreach ($globalStatsFilters[$globalFilterName] as $source) { |
|
| 22 | 22 | if (isset($source['source'])) $filter['source'][] = $source['source']; |
| 23 | 23 | } |
| 24 | 24 | } else { |
| 25 | 25 | $filter = $globalStatsFilters[$globalFilterName]; |
| 26 | 26 | } |
| 27 | 27 | } |
| 28 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 28 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 29 | 29 | $filter_query_join = ''; |
| 30 | 30 | $filter_query_where = ''; |
| 31 | 31 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 32 | - $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 32 | + $filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 33 | 33 | } |
| 34 | 34 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 35 | 35 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | try { |
| 45 | 45 | $sth = $this->db->prepare($query); |
| 46 | 46 | $sth->execute($query_values); |
| 47 | - } catch(PDOException $e) { |
|
| 47 | + } catch (PDOException $e) { |
|
| 48 | 48 | return "error : ".$e->getMessage(); |
| 49 | 49 | } |
| 50 | 50 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -52,66 +52,66 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | public function getById($id) { |
| 55 | - $filter_query = $this->getFilter(array(),true); |
|
| 55 | + $filter_query = $this->getFilter(array(), true); |
|
| 56 | 56 | $query = "SELECT * FROM atc".$filter_query." atc_id = :id"; |
| 57 | 57 | $query_values = array(':id' => $id); |
| 58 | 58 | try { |
| 59 | 59 | $sth = $this->db->prepare($query); |
| 60 | 60 | $sth->execute($query_values); |
| 61 | - } catch(PDOException $e) { |
|
| 61 | + } catch (PDOException $e) { |
|
| 62 | 62 | return "error : ".$e->getMessage(); |
| 63 | 63 | } |
| 64 | 64 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 65 | 65 | return $all; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - public function getByIdent($ident,$format_source = '') { |
|
| 69 | - $filter_query = $this->getFilter(array(),true); |
|
| 68 | + public function getByIdent($ident, $format_source = '') { |
|
| 69 | + $filter_query = $this->getFilter(array(), true); |
|
| 70 | 70 | if ($format_source == '') { |
| 71 | 71 | $query = "SELECT * FROM atc".$filter_query." ident = :ident"; |
| 72 | 72 | $query_values = array(':ident' => $ident); |
| 73 | 73 | } else { |
| 74 | 74 | $query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source"; |
| 75 | - $query_values = array(':ident' => $ident,':format_source' => $format_source); |
|
| 75 | + $query_values = array(':ident' => $ident, ':format_source' => $format_source); |
|
| 76 | 76 | } |
| 77 | 77 | try { |
| 78 | 78 | $sth = $this->db->prepare($query); |
| 79 | 79 | $sth->execute($query_values); |
| 80 | - } catch(PDOException $e) { |
|
| 80 | + } catch (PDOException $e) { |
|
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
| 83 | 83 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 84 | 84 | return $all; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 88 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 89 | - $info = str_replace('^','<br />',$info); |
|
| 90 | - $info = str_replace('&sect;','',$info); |
|
| 91 | - $info = str_replace('"','',$info); |
|
| 87 | + public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 88 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 89 | + $info = str_replace('^', '<br />', $info); |
|
| 90 | + $info = str_replace('&sect;', '', $info); |
|
| 91 | + $info = str_replace('"', '', $info); |
|
| 92 | 92 | if ($type == '') $type = NULL; |
| 93 | 93 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 94 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 94 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 95 | 95 | try { |
| 96 | 96 | $sth = $this->db->prepare($query); |
| 97 | 97 | $sth->execute($query_values); |
| 98 | - } catch(PDOException $e) { |
|
| 98 | + } catch (PDOException $e) { |
|
| 99 | 99 | return "error : ".$e->getMessage(); |
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 104 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 105 | - $info = str_replace('^','<br />',$info); |
|
| 106 | - $info = str_replace('&sect;','',$info); |
|
| 107 | - $info = str_replace('"','',$info); |
|
| 103 | + public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 104 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 105 | + $info = str_replace('^', '<br />', $info); |
|
| 106 | + $info = str_replace('&sect;', '', $info); |
|
| 107 | + $info = str_replace('"', '', $info); |
|
| 108 | 108 | if ($type == '') $type = NULL; |
| 109 | 109 | $query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name"; |
| 110 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 110 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 111 | 111 | try { |
| 112 | 112 | $sth = $this->db->prepare($query); |
| 113 | 113 | $sth->execute($query_values); |
| 114 | - } catch(PDOException $e) { |
|
| 114 | + } catch (PDOException $e) { |
|
| 115 | 115 | return "error : ".$e->getMessage(); |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -122,18 +122,18 @@ discard block |
||
| 122 | 122 | try { |
| 123 | 123 | $sth = $this->db->prepare($query); |
| 124 | 124 | $sth->execute($query_values); |
| 125 | - } catch(PDOException $e) { |
|
| 125 | + } catch (PDOException $e) { |
|
| 126 | 126 | return "error : ".$e->getMessage(); |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - public function deleteByIdent($ident,$format_source) { |
|
| 130 | + public function deleteByIdent($ident, $format_source) { |
|
| 131 | 131 | $query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source"; |
| 132 | - $query_values = array(':ident' => $ident,':format_source' => $format_source); |
|
| 132 | + $query_values = array(':ident' => $ident, ':format_source' => $format_source); |
|
| 133 | 133 | try { |
| 134 | 134 | $sth = $this->db->prepare($query); |
| 135 | 135 | $sth->execute($query_values); |
| 136 | - } catch(PDOException $e) { |
|
| 136 | + } catch (PDOException $e) { |
|
| 137 | 137 | return "error : ".$e->getMessage(); |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | try { |
| 145 | 145 | $sth = $this->db->prepare($query); |
| 146 | 146 | $sth->execute($query_values); |
| 147 | - } catch(PDOException $e) { |
|
| 147 | + } catch (PDOException $e) { |
|
| 148 | 148 | return "error : ".$e->getMessage(); |
| 149 | 149 | } |
| 150 | 150 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | try { |
| 160 | 160 | $sth = $this->db->prepare($query); |
| 161 | 161 | $sth->execute(); |
| 162 | - } catch(PDOException $e) { |
|
| 162 | + } catch (PDOException $e) { |
|
| 163 | 163 | return "error"; |
| 164 | 164 | } |
| 165 | 165 | return "success"; |
@@ -19,20 +19,27 @@ discard block |
||
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 20 | 20 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 21 | 21 | foreach($globalStatsFilters[$globalFilterName] as $source) { |
| 22 | - if (isset($source['source'])) $filter['source'][] = $source['source']; |
|
| 22 | + if (isset($source['source'])) { |
|
| 23 | + $filter['source'][] = $source['source']; |
|
| 24 | + } |
|
| 23 | 25 | } |
| 24 | 26 | } else { |
| 25 | 27 | $filter = $globalStatsFilters[$globalFilterName]; |
| 26 | 28 | } |
| 27 | 29 | } |
| 28 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 30 | + if (is_array($globalFilter)) { |
|
| 31 | + $filter = array_merge($filter,$globalFilter); |
|
| 32 | + } |
|
| 29 | 33 | $filter_query_join = ''; |
| 30 | 34 | $filter_query_where = ''; |
| 31 | 35 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 32 | 36 | $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
| 33 | 37 | } |
| 34 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 35 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 38 | + if ($filter_query_where == '' && $where) { |
|
| 39 | + $filter_query_where = ' WHERE'; |
|
| 40 | + } elseif ($filter_query_where != '' && $and) { |
|
| 41 | + $filter_query_where .= ' AND'; |
|
| 42 | + } |
|
| 36 | 43 | $filter_query = $filter_query_join.$filter_query_where; |
| 37 | 44 | return $filter_query; |
| 38 | 45 | } |
@@ -89,7 +96,9 @@ discard block |
||
| 89 | 96 | $info = str_replace('^','<br />',$info); |
| 90 | 97 | $info = str_replace('&sect;','',$info); |
| 91 | 98 | $info = str_replace('"','',$info); |
| 92 | - if ($type == '') $type = NULL; |
|
| 99 | + if ($type == '') { |
|
| 100 | + $type = NULL; |
|
| 101 | + } |
|
| 93 | 102 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 94 | 103 | $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
| 95 | 104 | try { |
@@ -105,7 +114,9 @@ discard block |
||
| 105 | 114 | $info = str_replace('^','<br />',$info); |
| 106 | 115 | $info = str_replace('&sect;','',$info); |
| 107 | 116 | $info = str_replace('"','',$info); |
| 108 | - if ($type == '') $type = NULL; |
|
| 117 | + if ($type == '') { |
|
| 118 | + $type = NULL; |
|
| 119 | + } |
|
| 109 | 120 | $query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name"; |
| 110 | 121 | $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
| 111 | 122 | try { |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | try { |
| 6 | 6 | $GeoidHeight = new GeoidHeight(); |
| 7 | 7 | } catch (Exception $e) { |
| 8 | - echo $e; |
|
| 8 | + echo $e; |
|
| 9 | 9 | } |
| 10 | 10 | $title = _("Geoid Height Calculator"); |
| 11 | 11 | require_once('header.php'); |
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | $page_url = $globalURL.'/tools-geoid'; |
| 14 | 14 | |
| 15 | -$latitude = filter_input(INPUT_POST,'latitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 16 | -$longitude = filter_input(INPUT_POST,'longitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 17 | -$altitude = filter_input(INPUT_POST,'altitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 15 | +$latitude = filter_input(INPUT_POST, 'latitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 16 | +$longitude = filter_input(INPUT_POST, 'longitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 17 | +$altitude = filter_input(INPUT_POST, 'altitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 18 | 18 | |
| 19 | 19 | print '<div class="info column">'; |
| 20 | 20 | print '<h1>'._("Geoid Height Calculator").'</h1>'; |
@@ -51,14 +51,14 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | if ($latitude != '' && $longitude != '') { |
| 53 | 53 | $globalDebug = FALSE; |
| 54 | - $geoid = $GeoidHeight->get($latitude,$longitude); |
|
| 54 | + $geoid = $GeoidHeight->get($latitude, $longitude); |
|
| 55 | 55 | print '<div class="row">'; |
| 56 | 56 | print '<div class="col-md-3 col-md-offset-5">'; |
| 57 | 57 | print '<div class="col-sm-6"><b>Geoid</b></div>'; |
| 58 | 58 | print '<div class="col-sm-6">'.$geoid.'</div>'; |
| 59 | 59 | if ($altitude != '') { |
| 60 | 60 | print '<div class="col-sm-6"><b>AMSL Elevation</b></div>'; |
| 61 | - print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>'; |
|
| 61 | + print '<div class="col-sm-6">'.round($altitude - $geoid, 3).'</div>'; |
|
| 62 | 62 | } |
| 63 | 63 | print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>'; |
| 64 | 64 | if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource; |
@@ -61,8 +61,11 @@ |
||
| 61 | 61 | print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>'; |
| 62 | 62 | } |
| 63 | 63 | print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>'; |
| 64 | - if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource; |
|
| 65 | - else $geoidsource = 'EGM96-15'; |
|
| 64 | + if (isset($globalGeoidSource) && $globalGeoidSource != '') { |
|
| 65 | + $geoidsource = $globalGeoidSource; |
|
| 66 | + } else { |
|
| 67 | + $geoidsource = 'EGM96-15'; |
|
| 68 | + } |
|
| 66 | 69 | print '<div class="col-sm-6">'.$geoidsource.'</div>'; |
| 67 | 70 | print '</div>'; |
| 68 | 71 | } |
