Ysurac /
FlightAirMap
@@ -6,6 +6,9 @@ discard block |
||
| 6 | 6 | public $dbs = array(); |
| 7 | 7 | public $latest_schema = 43; |
| 8 | 8 | |
| 9 | + /** |
|
| 10 | + * @param string $dbname |
|
| 11 | + */ |
|
| 9 | 12 | public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
| 10 | 13 | global $globalDBdriver, $globalNoDB; |
| 11 | 14 | if (isset($globalNoDB) && $globalNoDB === TRUE) { |
@@ -141,6 +144,9 @@ discard block |
||
| 141 | 144 | return true; |
| 142 | 145 | } |
| 143 | 146 | |
| 147 | + /** |
|
| 148 | + * @param string $table |
|
| 149 | + */ |
|
| 144 | 150 | public function tableExists($table) |
| 145 | 151 | { |
| 146 | 152 | global $globalDBdriver, $globalDBname; |
@@ -190,6 +196,11 @@ discard block |
||
| 190 | 196 | /* |
| 191 | 197 | * Check if index exist |
| 192 | 198 | */ |
| 199 | + |
|
| 200 | + /** |
|
| 201 | + * @param string $table |
|
| 202 | + * @param string $index |
|
| 203 | + */ |
|
| 193 | 204 | public function indexExists($table,$index) |
| 194 | 205 | { |
| 195 | 206 | global $globalDBdriver, $globalDBname; |
@@ -232,6 +243,10 @@ discard block |
||
| 232 | 243 | return $columns; |
| 233 | 244 | } |
| 234 | 245 | |
| 246 | + /** |
|
| 247 | + * @param string $table |
|
| 248 | + * @param string $column |
|
| 249 | + */ |
|
| 235 | 250 | public function getColumnType($table,$column) { |
| 236 | 251 | $select = $this->db->query('SELECT '.$column.' FROM '.$table); |
| 237 | 252 | $tomet = $select->getColumnMeta(0); |
@@ -242,6 +257,11 @@ discard block |
||
| 242 | 257 | * Check if a column name exist in a table |
| 243 | 258 | * @return Boolean column exist or not |
| 244 | 259 | */ |
| 260 | + |
|
| 261 | + /** |
|
| 262 | + * @param string $table |
|
| 263 | + * @param string $name |
|
| 264 | + */ |
|
| 245 | 265 | public function checkColumnName($table,$name) |
| 246 | 266 | { |
| 247 | 267 | global $globalDBdriver, $globalDBname; |
@@ -7,35 +7,35 @@ discard block |
||
| 7 | 7 | public $latest_schema = 43; |
| 8 | 8 | |
| 9 | 9 | public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
| 10 | - global $globalDBdriver, $globalNoDB; |
|
| 11 | - if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 10 | + global $globalDBdriver, $globalNoDB; |
|
| 11 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 12 | 12 | $this->db = null; |
| 13 | - } else { |
|
| 13 | + } else { |
|
| 14 | 14 | if ($dbc === null) { |
| 15 | - if ($this->db === null && $dbname === null) { |
|
| 15 | + if ($this->db === null && $dbname === null) { |
|
| 16 | 16 | if ($user === null && $pass === null) { |
| 17 | - $this->createDBConnection(); |
|
| 17 | + $this->createDBConnection(); |
|
| 18 | 18 | } else { |
| 19 | - $this->createDBConnection(null,$user,$pass); |
|
| 19 | + $this->createDBConnection(null,$user,$pass); |
|
| 20 | 20 | } |
| 21 | - } else { |
|
| 21 | + } else { |
|
| 22 | 22 | $this->createDBConnection($dbname); |
| 23 | - } |
|
| 23 | + } |
|
| 24 | 24 | } elseif ($dbname === null || $dbname === 'default') { |
| 25 | - $this->db = $dbc; |
|
| 26 | - if ($this->connectionExists() === false) { |
|
| 25 | + $this->db = $dbc; |
|
| 26 | + if ($this->connectionExists() === false) { |
|
| 27 | 27 | /* |
| 28 | 28 | echo 'Restart Connection !!!'."\n"; |
| 29 | 29 | $e = new \Exception; |
| 30 | 30 | var_dump($e->getTraceAsString()); |
| 31 | 31 | */ |
| 32 | 32 | $this->createDBConnection(); |
| 33 | - } |
|
| 33 | + } |
|
| 34 | 34 | } else { |
| 35 | - //$this->connectionExists(); |
|
| 36 | - $this->dbs[$dbname] = $dbc; |
|
| 35 | + //$this->connectionExists(); |
|
| 36 | + $this->dbs[$dbname] = $dbc; |
|
| 37 | + } |
|
| 37 | 38 | } |
| 38 | - } |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function db() { |
@@ -56,11 +56,11 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | - * Creates the database connection |
|
| 60 | - * |
|
| 61 | - * @return Boolean of the database connection |
|
| 62 | - * |
|
| 63 | - */ |
|
| 59 | + * Creates the database connection |
|
| 60 | + * |
|
| 61 | + * @return Boolean of the database connection |
|
| 62 | + * |
|
| 63 | + */ |
|
| 64 | 64 | |
| 65 | 65 | public function createDBConnection($DBname = null, $user = null, $pass = null) |
| 66 | 66 | { |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | return false; |
| 158 | 158 | } |
| 159 | 159 | if($results->rowCount()>0) { |
| 160 | - return true; |
|
| 160 | + return true; |
|
| 161 | 161 | } |
| 162 | 162 | else return false; |
| 163 | 163 | } |
@@ -174,14 +174,14 @@ discard block |
||
| 174 | 174 | $sum = $sum->fetchColumn(0); |
| 175 | 175 | } else $sum = 0; |
| 176 | 176 | if (intval($sum) !== 2) { |
| 177 | - return false; |
|
| 177 | + return false; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | } catch(PDOException $e) { |
| 181 | 181 | if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
| 182 | - throw $e; |
|
| 183 | - } |
|
| 184 | - //echo 'error ! '.$e->getMessage(); |
|
| 182 | + throw $e; |
|
| 183 | + } |
|
| 184 | + //echo 'error ! '.$e->getMessage(); |
|
| 185 | 185 | return false; |
| 186 | 186 | } |
| 187 | 187 | return true; |
@@ -285,8 +285,8 @@ discard block |
||
| 285 | 285 | $version = 0; |
| 286 | 286 | if ($this->tableExists('aircraft')) { |
| 287 | 287 | if (!$this->tableExists('config')) { |
| 288 | - $version = '1'; |
|
| 289 | - return $version; |
|
| 288 | + $version = '1'; |
|
| 289 | + return $version; |
|
| 290 | 290 | } else { |
| 291 | 291 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
| 292 | 292 | try { |
@@ -307,10 +307,10 @@ discard block |
||
| 307 | 307 | * @return Boolean if latest version or not |
| 308 | 308 | */ |
| 309 | 309 | public function latest() { |
| 310 | - global $globalNoDB; |
|
| 311 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 312 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 313 | - else return false; |
|
| 310 | + global $globalNoDB; |
|
| 311 | + if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 312 | + if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 313 | + else return false; |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | } |
@@ -1,12 +1,12 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/settings.php'); |
| 3 | 3 | |
| 4 | -class Connection{ |
|
| 4 | +class Connection { |
|
| 5 | 5 | public $db = null; |
| 6 | 6 | public $dbs = array(); |
| 7 | 7 | public $latest_schema = 43; |
| 8 | 8 | |
| 9 | - public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
|
| 9 | + public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) { |
|
| 10 | 10 | global $globalDBdriver, $globalNoDB; |
| 11 | 11 | if (isset($globalNoDB) && $globalNoDB === TRUE) { |
| 12 | 12 | $this->db = null; |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | if ($user === null && $pass === null) { |
| 17 | 17 | $this->createDBConnection(); |
| 18 | 18 | } else { |
| 19 | - $this->createDBConnection(null,$user,$pass); |
|
| 19 | + $this->createDBConnection(null, $user, $pass); |
|
| 20 | 20 | } |
| 21 | 21 | } else { |
| 22 | 22 | $this->createDBConnection($dbname); |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | while (true) { |
| 101 | 101 | try { |
| 102 | 102 | if ($globalDBSdriver == 'mysql') { |
| 103 | - $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass); |
|
| 103 | + $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass); |
|
| 104 | 104 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 105 | 105 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 106 | - $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
|
| 107 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 108 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 109 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 110 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 106 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
|
| 107 | + if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500); |
|
| 108 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut); |
|
| 109 | + if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true); |
|
| 110 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent); |
|
| 111 | 111 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 112 | 112 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); |
| 113 | 113 | // Workaround against "ONLY_FULL_GROUP_BY" mode |
@@ -117,19 +117,19 @@ discard block |
||
| 117 | 117 | $this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"'); |
| 118 | 118 | //$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"'); |
| 119 | 119 | } else { |
| 120 | - $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass); |
|
| 120 | + $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass); |
|
| 121 | 121 | //$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 122 | 122 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 123 | - $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
|
| 124 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 125 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 126 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 127 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 123 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
|
| 124 | + if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200); |
|
| 125 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut); |
|
| 126 | + if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true); |
|
| 127 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent); |
|
| 128 | 128 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 129 | 129 | $this->dbs[$DBname]->exec('SET timezone="UTC"'); |
| 130 | 130 | } |
| 131 | 131 | break; |
| 132 | - } catch(PDOException $e) { |
|
| 132 | + } catch (PDOException $e) { |
|
| 133 | 133 | $i++; |
| 134 | 134 | if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
| 135 | 135 | //exit; |
@@ -153,10 +153,10 @@ discard block |
||
| 153 | 153 | try { |
| 154 | 154 | //$Connection = new Connection(); |
| 155 | 155 | $results = $this->db->query($query); |
| 156 | - } catch(PDOException $e) { |
|
| 156 | + } catch (PDOException $e) { |
|
| 157 | 157 | return false; |
| 158 | 158 | } |
| 159 | - if($results->rowCount()>0) { |
|
| 159 | + if ($results->rowCount() > 0) { |
|
| 160 | 160 | return true; |
| 161 | 161 | } |
| 162 | 162 | else return false; |
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | return false; |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - } catch(PDOException $e) { |
|
| 181 | - if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
|
| 180 | + } catch (PDOException $e) { |
|
| 181 | + if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
|
| 182 | 182 | throw $e; |
| 183 | 183 | } |
| 184 | 184 | //echo 'error ! '.$e->getMessage(); |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | /* |
| 191 | 191 | * Check if index exist |
| 192 | 192 | */ |
| 193 | - public function indexExists($table,$index) |
|
| 193 | + public function indexExists($table, $index) |
|
| 194 | 194 | { |
| 195 | 195 | global $globalDBdriver, $globalDBname; |
| 196 | 196 | if ($globalDBdriver == 'mysql') { |
@@ -201,11 +201,11 @@ discard block |
||
| 201 | 201 | try { |
| 202 | 202 | //$Connection = new Connection(); |
| 203 | 203 | $results = $this->db->query($query); |
| 204 | - } catch(PDOException $e) { |
|
| 204 | + } catch (PDOException $e) { |
|
| 205 | 205 | return false; |
| 206 | 206 | } |
| 207 | 207 | $nb = $results->fetchAll(PDO::FETCH_ASSOC); |
| 208 | - if($nb[0]['nb'] > 0) { |
|
| 208 | + if ($nb[0]['nb'] > 0) { |
|
| 209 | 209 | return true; |
| 210 | 210 | } |
| 211 | 211 | else return false; |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | $query = "SELECT * FROM ".$table." LIMIT 0"; |
| 221 | 221 | try { |
| 222 | 222 | $results = $this->db->query($query); |
| 223 | - } catch(PDOException $e) { |
|
| 223 | + } catch (PDOException $e) { |
|
| 224 | 224 | return "error : ".$e->getMessage()."\n"; |
| 225 | 225 | } |
| 226 | 226 | $columns = array(); |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | return $columns; |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - public function getColumnType($table,$column) { |
|
| 235 | + public function getColumnType($table, $column) { |
|
| 236 | 236 | $select = $this->db->query('SELECT '.$column.' FROM '.$table); |
| 237 | 237 | $tomet = $select->getColumnMeta(0); |
| 238 | 238 | return $tomet['native_type']; |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | * Check if a column name exist in a table |
| 243 | 243 | * @return Boolean column exist or not |
| 244 | 244 | */ |
| 245 | - public function checkColumnName($table,$name) |
|
| 245 | + public function checkColumnName($table, $name) |
|
| 246 | 246 | { |
| 247 | 247 | global $globalDBdriver, $globalDBname; |
| 248 | 248 | if ($globalDBdriver == 'mysql') { |
@@ -252,8 +252,8 @@ discard block |
||
| 252 | 252 | } |
| 253 | 253 | try { |
| 254 | 254 | $sth = $this->db()->prepare($query); |
| 255 | - $sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name)); |
|
| 256 | - } catch(PDOException $e) { |
|
| 255 | + $sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name)); |
|
| 256 | + } catch (PDOException $e) { |
|
| 257 | 257 | echo "error : ".$e->getMessage()."\n"; |
| 258 | 258 | } |
| 259 | 259 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | try { |
| 293 | 293 | $sth = $this->db->prepare($query); |
| 294 | 294 | $sth->execute(); |
| 295 | - } catch(PDOException $e) { |
|
| 295 | + } catch (PDOException $e) { |
|
| 296 | 296 | return "error : ".$e->getMessage()."\n"; |
| 297 | 297 | } |
| 298 | 298 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -8,8 +8,12 @@ discard block |
||
| 8 | 8 | } |
| 9 | 9 | $tracker = false; |
| 10 | 10 | $marine = false; |
| 11 | -if (isset($_GET['tracker'])) $tracker = true; |
|
| 12 | -if (isset($_GET['marine'])) $marine = true; |
|
| 11 | +if (isset($_GET['tracker'])) { |
|
| 12 | + $tracker = true; |
|
| 13 | +} |
|
| 14 | +if (isset($_GET['marine'])) { |
|
| 15 | + $marine = true; |
|
| 16 | +} |
|
| 13 | 17 | if ($tracker) { |
| 14 | 18 | require_once('require/class.Tracker.php'); |
| 15 | 19 | require_once('require/class.TrackerLive.php'); |
@@ -66,23 +70,46 @@ discard block |
||
| 66 | 70 | } |
| 67 | 71 | header('Content-Type: text/javascript'); |
| 68 | 72 | |
| 69 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 70 | -else $compress = $globalJsonCompress; |
|
| 73 | +if (!isset($globalJsonCompress)) { |
|
| 74 | + $compress = true; |
|
| 75 | +} else { |
|
| 76 | + $compress = $globalJsonCompress; |
|
| 77 | +} |
|
| 71 | 78 | |
| 72 | 79 | $from_archive = false; |
| 73 | 80 | $min = false; |
| 74 | 81 | $allhistory = false; |
| 75 | 82 | $filter['source'] = array(); |
| 76 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 77 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 78 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 79 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs')); |
|
| 80 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 81 | -if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING); |
|
| 82 | -if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING); |
|
| 83 | -if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING); |
|
| 84 | -if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING); |
|
| 85 | -if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING); |
|
| 83 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') { |
|
| 84 | + $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 85 | +} |
|
| 86 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') { |
|
| 87 | + $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 88 | +} |
|
| 89 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') { |
|
| 90 | + $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 91 | +} |
|
| 92 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') { |
|
| 93 | + $filter['source'] = array_merge($filter['source'],array('sbs','famaprs')); |
|
| 94 | +} |
|
| 95 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') { |
|
| 96 | + $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 97 | +} |
|
| 98 | +if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') { |
|
| 99 | + $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING); |
|
| 100 | +} |
|
| 101 | +if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') { |
|
| 102 | + $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING); |
|
| 103 | +} |
|
| 104 | +if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') { |
|
| 105 | + $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING); |
|
| 106 | +} |
|
| 107 | +if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') { |
|
| 108 | + $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING); |
|
| 109 | +} |
|
| 110 | +if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') { |
|
| 111 | + $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING); |
|
| 112 | +} |
|
| 86 | 113 | /* |
| 87 | 114 | if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) { |
| 88 | 115 | $min = true; |
@@ -167,8 +194,12 @@ discard block |
||
| 167 | 194 | } else { |
| 168 | 195 | $flightcnt = $SpotterLive->getLiveSpotterCount($filter); |
| 169 | 196 | } |
| 170 | - if ($flightcnt == '') $flightcnt = 0; |
|
| 171 | -} else $flightcnt = 0; |
|
| 197 | + if ($flightcnt == '') { |
|
| 198 | + $flightcnt = 0; |
|
| 199 | + } |
|
| 200 | + } else { |
|
| 201 | + $flightcnt = 0; |
|
| 202 | +} |
|
| 172 | 203 | |
| 173 | 204 | $sqltime = round(microtime(true)-$begintime,2); |
| 174 | 205 | $minitime = time(); |
@@ -192,7 +223,9 @@ discard block |
||
| 192 | 223 | $j = 0; |
| 193 | 224 | $prev_flightaware_id = ''; |
| 194 | 225 | $speed = 1; |
| 195 | -if (isset($archivespeed)) $speed = $archivespeed; |
|
| 226 | +if (isset($archivespeed)) { |
|
| 227 | + $speed = $archivespeed; |
|
| 228 | +} |
|
| 196 | 229 | $output = '['; |
| 197 | 230 | if ($tracker) { |
| 198 | 231 | $output .= '{"id" : "document", "name" : "tracker","version" : "1.0"'; |
@@ -226,9 +259,13 @@ discard block |
||
| 226 | 259 | $image = "images/placeholder_thumb.png"; |
| 227 | 260 | } |
| 228 | 261 | |
| 229 | - if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 230 | - elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 231 | - elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 262 | + if (isset($spotter_item['flightaware_id'])) { |
|
| 263 | + $id = $spotter_item['flightaware_id']; |
|
| 264 | + } elseif (isset($spotter_item['famtrackid'])) { |
|
| 265 | + $id = $spotter_item['famtrackid']; |
|
| 266 | + } elseif (isset($spotter_item['fammarine_id'])) { |
|
| 267 | + $id = $spotter_item['fammarine_id']; |
|
| 268 | + } |
|
| 232 | 269 | if ($prev_flightaware_id != $id) { |
| 233 | 270 | if ($prev_flightaware_id != '') { |
| 234 | 271 | $output .= ']'; |
@@ -267,7 +304,9 @@ discard block |
||
| 267 | 304 | $spotter_item['engine_type'] = $aircraft_info[0]['engine_type']; |
| 268 | 305 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 269 | 306 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 270 | - } else $aircraft_shadow = ''; |
|
| 307 | + } else { |
|
| 308 | + $aircraft_shadow = ''; |
|
| 309 | + } |
|
| 271 | 310 | $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
| 272 | 311 | if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] && isset($_COOKIE['IconColor'])) { |
| 273 | 312 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
@@ -275,7 +314,9 @@ discard block |
||
| 275 | 314 | } |
| 276 | 315 | $output .= '},'; |
| 277 | 316 | } |
| 278 | - } else $output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},'; |
|
| 317 | + } else { |
|
| 318 | + $output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},'; |
|
| 319 | + } |
|
| 279 | 320 | } elseif ($one3dmodel) { |
| 280 | 321 | if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') { |
| 281 | 322 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20'; |
@@ -306,7 +347,9 @@ discard block |
||
| 306 | 347 | $spotter_item['engine_type'] = $aircraft_info[0]['engine_type']; |
| 307 | 348 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 308 | 349 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 309 | - } else $aircraft_shadow = ''; |
|
| 350 | + } else { |
|
| 351 | + $aircraft_shadow = ''; |
|
| 352 | + } |
|
| 310 | 353 | if ($aircraft_shadow != '') { |
| 311 | 354 | if (isset($modelsdb[$aircraft_shadow])) { |
| 312 | 355 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20'; |
@@ -443,7 +486,9 @@ discard block |
||
| 443 | 486 | } |
| 444 | 487 | $output .= '},'; |
| 445 | 488 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 446 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 489 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 490 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 491 | + } |
|
| 447 | 492 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 448 | 493 | } |
| 449 | 494 | } elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') { |
@@ -465,7 +510,9 @@ discard block |
||
| 465 | 510 | } |
| 466 | 511 | $output .= '},'; |
| 467 | 512 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 468 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 513 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 514 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 515 | + } |
|
| 469 | 516 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 470 | 517 | } |
| 471 | 518 | } else { |
@@ -478,7 +525,9 @@ discard block |
||
| 478 | 525 | } |
| 479 | 526 | $output .= '},'; |
| 480 | 527 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 481 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 528 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 529 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 530 | + } |
|
| 482 | 531 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 483 | 532 | } |
| 484 | 533 | } elseif ($tracker && isset($spotter_item['type'])) { |
@@ -533,8 +582,12 @@ discard block |
||
| 533 | 582 | // $output .= '"interpolationDegree" : 5,'; |
| 534 | 583 | // $output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", '; |
| 535 | 584 | $output .= '"cartographicDegrees": ['; |
| 536 | - if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']); |
|
| 537 | - if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']); |
|
| 585 | + if ($minitime > strtotime($spotter_item['date'])) { |
|
| 586 | + $minitime = strtotime($spotter_item['date']); |
|
| 587 | + } |
|
| 588 | + if ($maxitime < strtotime($spotter_item['date'])) { |
|
| 589 | + $maxitime = strtotime($spotter_item['date']); |
|
| 590 | + } |
|
| 538 | 591 | $output .= '"'.date("c",strtotime($spotter_item['date'])).'", '; |
| 539 | 592 | $output .= $spotter_item['longitude'].', '; |
| 540 | 593 | $output .= $spotter_item['latitude']; |
@@ -548,19 +601,26 @@ discard block |
||
| 548 | 601 | $output .= ', '.round($spotter_item['altitude']*30.48); |
| 549 | 602 | $prevalt = round($spotter_item['altitude']*30.48); |
| 550 | 603 | } |
| 551 | - } else $output .= ', 0'; |
|
| 604 | + } else { |
|
| 605 | + $output .= ', 0'; |
|
| 606 | + } |
|
| 552 | 607 | //$orientation = '"orientation" : { '; |
| 553 | 608 | //$orientation .= '"unitQuaternion": ['; |
| 554 | 609 | //$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0)); |
| 555 | 610 | //$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w']; |
| 556 | 611 | } else { |
| 557 | 612 | $output .= ',"'.date("c",strtotime($spotter_item['date'])).'", '; |
| 558 | - if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']); |
|
| 613 | + if ($maxitime < strtotime($spotter_item['date'])) { |
|
| 614 | + $maxitime = strtotime($spotter_item['date']); |
|
| 615 | + } |
|
| 559 | 616 | if ($spotter_item['ground_speed'] == 0) { |
| 560 | 617 | $output .= $prevlong.', '; |
| 561 | 618 | $output .= $prevlat; |
| 562 | - if (!$tracker && !$marine) $output .= ', '.$prevalt; |
|
| 563 | - else $output .= ', 0'; |
|
| 619 | + if (!$tracker && !$marine) { |
|
| 620 | + $output .= ', '.$prevalt; |
|
| 621 | + } else { |
|
| 622 | + $output .= ', 0'; |
|
| 623 | + } |
|
| 564 | 624 | } else { |
| 565 | 625 | $output .= $spotter_item['longitude'].', '; |
| 566 | 626 | $output .= $spotter_item['latitude']; |
@@ -572,10 +632,15 @@ discard block |
||
| 572 | 632 | $output .= ', 0'; |
| 573 | 633 | } |
| 574 | 634 | } else { |
| 575 | - if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048); |
|
| 576 | - else $output .= ', '.round($spotter_item['altitude']*30.48); |
|
| 635 | + if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') { |
|
| 636 | + $output .= ', '.round($spotter_item['real_altitude']*0.3048); |
|
| 637 | + } else { |
|
| 638 | + $output .= ', '.round($spotter_item['altitude']*30.48); |
|
| 639 | + } |
|
| 577 | 640 | } |
| 578 | - } else $output .= ', 0'; |
|
| 641 | + } else { |
|
| 642 | + $output .= ', 0'; |
|
| 643 | + } |
|
| 579 | 644 | } |
| 580 | 645 | //$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0)); |
| 581 | 646 | //$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w']; |
@@ -588,9 +653,14 @@ discard block |
||
| 588 | 653 | } |
| 589 | 654 | $output .= ']'; |
| 590 | 655 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 591 | - if (time()-$globalLiveInterval < $minitime) $output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output); |
|
| 592 | - else $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 593 | -} else $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 656 | + if (time()-$globalLiveInterval < $minitime) { |
|
| 657 | + $output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output); |
|
| 658 | + } else { |
|
| 659 | + $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 660 | + } |
|
| 661 | + } else { |
|
| 662 | + $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 663 | +} |
|
| 594 | 664 | $output = str_replace('%maxitime%',date("c",$maxitime),$output); |
| 595 | 665 | print $output; |
| 596 | 666 | ?> |
@@ -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); |
@@ -1719,7 +1719,7 @@ discard block |
||
| 1719 | 1719 | } catch(PDOException $e) { |
| 1720 | 1720 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1721 | 1721 | } |
| 1722 | - } |
|
| 1722 | + } |
|
| 1723 | 1723 | $query = "UPDATE config SET value = '38' WHERE name = 'schema_version'"; |
| 1724 | 1724 | try { |
| 1725 | 1725 | $sth = $Connection->db->prepare($query); |
@@ -2055,197 +2055,197 @@ discard block |
||
| 2055 | 2055 | |
| 2056 | 2056 | |
| 2057 | 2057 | |
| 2058 | - public static function check_version($update = false) { |
|
| 2059 | - global $globalDBname; |
|
| 2060 | - $version = 0; |
|
| 2061 | - $Connection = new Connection(); |
|
| 2062 | - if ($Connection->tableExists('aircraft')) { |
|
| 2063 | - if (!$Connection->tableExists('config')) { |
|
| 2064 | - $version = '1'; |
|
| 2065 | - if ($update) return self::update_from_1(); |
|
| 2066 | - else return $version; |
|
| 2058 | + public static function check_version($update = false) { |
|
| 2059 | + global $globalDBname; |
|
| 2060 | + $version = 0; |
|
| 2061 | + $Connection = new Connection(); |
|
| 2062 | + if ($Connection->tableExists('aircraft')) { |
|
| 2063 | + if (!$Connection->tableExists('config')) { |
|
| 2064 | + $version = '1'; |
|
| 2065 | + if ($update) return self::update_from_1(); |
|
| 2066 | + else return $version; |
|
| 2067 | 2067 | } else { |
| 2068 | - $Connection = new Connection(); |
|
| 2069 | - $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
|
| 2070 | - try { |
|
| 2071 | - $sth = $Connection->db->prepare($query); |
|
| 2072 | - $sth->execute(); |
|
| 2073 | - } catch(PDOException $e) { |
|
| 2068 | + $Connection = new Connection(); |
|
| 2069 | + $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
|
| 2070 | + try { |
|
| 2071 | + $sth = $Connection->db->prepare($query); |
|
| 2072 | + $sth->execute(); |
|
| 2073 | + } catch(PDOException $e) { |
|
| 2074 | 2074 | return "error : ".$e->getMessage()."\n"; |
| 2075 | - } |
|
| 2076 | - $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2077 | - if ($update) { |
|
| 2078 | - if ($result['value'] == '2') { |
|
| 2079 | - $error = self::update_from_2(); |
|
| 2080 | - if ($error != '') return $error; |
|
| 2081 | - else return self::check_version(true); |
|
| 2082 | - } elseif ($result['value'] == '3') { |
|
| 2083 | - $error = self::update_from_3(); |
|
| 2084 | - if ($error != '') return $error; |
|
| 2085 | - else return self::check_version(true); |
|
| 2086 | - } elseif ($result['value'] == '4') { |
|
| 2087 | - $error = self::update_from_4(); |
|
| 2088 | - if ($error != '') return $error; |
|
| 2089 | - else return self::check_version(true); |
|
| 2090 | - } elseif ($result['value'] == '5') { |
|
| 2091 | - $error = self::update_from_5(); |
|
| 2092 | - if ($error != '') return $error; |
|
| 2093 | - else return self::check_version(true); |
|
| 2094 | - } elseif ($result['value'] == '6') { |
|
| 2095 | - $error = self::update_from_6(); |
|
| 2096 | - if ($error != '') return $error; |
|
| 2097 | - else return self::check_version(true); |
|
| 2098 | - } elseif ($result['value'] == '7') { |
|
| 2099 | - $error = self::update_from_7(); |
|
| 2100 | - if ($error != '') return $error; |
|
| 2101 | - else return self::check_version(true); |
|
| 2102 | - } elseif ($result['value'] == '8') { |
|
| 2103 | - $error = self::update_from_8(); |
|
| 2104 | - if ($error != '') return $error; |
|
| 2105 | - else return self::check_version(true); |
|
| 2106 | - } elseif ($result['value'] == '9') { |
|
| 2107 | - $error = self::update_from_9(); |
|
| 2108 | - if ($error != '') return $error; |
|
| 2109 | - else return self::check_version(true); |
|
| 2110 | - } elseif ($result['value'] == '10') { |
|
| 2111 | - $error = self::update_from_10(); |
|
| 2112 | - if ($error != '') return $error; |
|
| 2113 | - else return self::check_version(true); |
|
| 2114 | - } elseif ($result['value'] == '11') { |
|
| 2115 | - $error = self::update_from_11(); |
|
| 2116 | - if ($error != '') return $error; |
|
| 2117 | - else return self::check_version(true); |
|
| 2118 | - } elseif ($result['value'] == '12') { |
|
| 2119 | - $error = self::update_from_12(); |
|
| 2120 | - if ($error != '') return $error; |
|
| 2121 | - else return self::check_version(true); |
|
| 2122 | - } elseif ($result['value'] == '13') { |
|
| 2123 | - $error = self::update_from_13(); |
|
| 2124 | - if ($error != '') return $error; |
|
| 2125 | - else return self::check_version(true); |
|
| 2126 | - } elseif ($result['value'] == '14') { |
|
| 2127 | - $error = self::update_from_14(); |
|
| 2128 | - if ($error != '') return $error; |
|
| 2129 | - else return self::check_version(true); |
|
| 2130 | - } elseif ($result['value'] == '15') { |
|
| 2131 | - $error = self::update_from_15(); |
|
| 2132 | - if ($error != '') return $error; |
|
| 2133 | - else return self::check_version(true); |
|
| 2134 | - } elseif ($result['value'] == '16') { |
|
| 2135 | - $error = self::update_from_16(); |
|
| 2136 | - if ($error != '') return $error; |
|
| 2137 | - else return self::check_version(true); |
|
| 2138 | - } elseif ($result['value'] == '17') { |
|
| 2139 | - $error = self::update_from_17(); |
|
| 2140 | - if ($error != '') return $error; |
|
| 2141 | - else return self::check_version(true); |
|
| 2142 | - } elseif ($result['value'] == '18') { |
|
| 2143 | - $error = self::update_from_18(); |
|
| 2144 | - if ($error != '') return $error; |
|
| 2145 | - else return self::check_version(true); |
|
| 2146 | - } elseif ($result['value'] == '19') { |
|
| 2147 | - $error = self::update_from_19(); |
|
| 2148 | - if ($error != '') return $error; |
|
| 2149 | - else return self::check_version(true); |
|
| 2150 | - } elseif ($result['value'] == '20') { |
|
| 2151 | - $error = self::update_from_20(); |
|
| 2152 | - if ($error != '') return $error; |
|
| 2153 | - else return self::check_version(true); |
|
| 2154 | - } elseif ($result['value'] == '21') { |
|
| 2155 | - $error = self::update_from_21(); |
|
| 2156 | - if ($error != '') return $error; |
|
| 2157 | - else return self::check_version(true); |
|
| 2158 | - } elseif ($result['value'] == '22') { |
|
| 2159 | - $error = self::update_from_22(); |
|
| 2160 | - if ($error != '') return $error; |
|
| 2161 | - else return self::check_version(true); |
|
| 2162 | - } elseif ($result['value'] == '23') { |
|
| 2163 | - $error = self::update_from_23(); |
|
| 2164 | - if ($error != '') return $error; |
|
| 2165 | - else return self::check_version(true); |
|
| 2166 | - } elseif ($result['value'] == '24') { |
|
| 2167 | - $error = self::update_from_24(); |
|
| 2168 | - if ($error != '') return $error; |
|
| 2169 | - else return self::check_version(true); |
|
| 2170 | - } elseif ($result['value'] == '25') { |
|
| 2171 | - $error = self::update_from_25(); |
|
| 2172 | - if ($error != '') return $error; |
|
| 2173 | - else return self::check_version(true); |
|
| 2174 | - } elseif ($result['value'] == '26') { |
|
| 2175 | - $error = self::update_from_26(); |
|
| 2176 | - if ($error != '') return $error; |
|
| 2177 | - else return self::check_version(true); |
|
| 2178 | - } elseif ($result['value'] == '27') { |
|
| 2179 | - $error = self::update_from_27(); |
|
| 2180 | - if ($error != '') return $error; |
|
| 2181 | - else return self::check_version(true); |
|
| 2182 | - } elseif ($result['value'] == '28') { |
|
| 2183 | - $error = self::update_from_28(); |
|
| 2184 | - if ($error != '') return $error; |
|
| 2185 | - else return self::check_version(true); |
|
| 2186 | - } elseif ($result['value'] == '29') { |
|
| 2187 | - $error = self::update_from_29(); |
|
| 2188 | - if ($error != '') return $error; |
|
| 2189 | - else return self::check_version(true); |
|
| 2190 | - } elseif ($result['value'] == '30') { |
|
| 2191 | - $error = self::update_from_30(); |
|
| 2192 | - if ($error != '') return $error; |
|
| 2193 | - else return self::check_version(true); |
|
| 2194 | - } elseif ($result['value'] == '31') { |
|
| 2195 | - $error = self::update_from_31(); |
|
| 2196 | - if ($error != '') return $error; |
|
| 2197 | - else return self::check_version(true); |
|
| 2198 | - } elseif ($result['value'] == '32') { |
|
| 2199 | - $error = self::update_from_32(); |
|
| 2200 | - if ($error != '') return $error; |
|
| 2201 | - else return self::check_version(true); |
|
| 2202 | - } elseif ($result['value'] == '33') { |
|
| 2203 | - $error = self::update_from_33(); |
|
| 2204 | - if ($error != '') return $error; |
|
| 2205 | - else return self::check_version(true); |
|
| 2206 | - } elseif ($result['value'] == '34') { |
|
| 2207 | - $error = self::update_from_34(); |
|
| 2208 | - if ($error != '') return $error; |
|
| 2209 | - else return self::check_version(true); |
|
| 2210 | - } elseif ($result['value'] == '35') { |
|
| 2211 | - $error = self::update_from_35(); |
|
| 2212 | - if ($error != '') return $error; |
|
| 2213 | - else return self::check_version(true); |
|
| 2214 | - } elseif ($result['value'] == '36') { |
|
| 2215 | - $error = self::update_from_36(); |
|
| 2216 | - if ($error != '') return $error; |
|
| 2217 | - else return self::check_version(true); |
|
| 2218 | - } elseif ($result['value'] == '37') { |
|
| 2219 | - $error = self::update_from_37(); |
|
| 2220 | - if ($error != '') return $error; |
|
| 2221 | - else return self::check_version(true); |
|
| 2222 | - } elseif ($result['value'] == '38') { |
|
| 2223 | - $error = self::update_from_38(); |
|
| 2224 | - if ($error != '') return $error; |
|
| 2225 | - else return self::check_version(true); |
|
| 2226 | - } elseif ($result['value'] == '39') { |
|
| 2227 | - $error = self::update_from_39(); |
|
| 2228 | - if ($error != '') return $error; |
|
| 2229 | - else return self::check_version(true); |
|
| 2230 | - } elseif ($result['value'] == '40') { |
|
| 2231 | - $error = self::update_from_40(); |
|
| 2232 | - if ($error != '') return $error; |
|
| 2233 | - else return self::check_version(true); |
|
| 2234 | - } elseif ($result['value'] == '41') { |
|
| 2235 | - $error = self::update_from_41(); |
|
| 2236 | - if ($error != '') return $error; |
|
| 2237 | - else return self::check_version(true); |
|
| 2238 | - } elseif ($result['value'] == '42') { |
|
| 2239 | - $error = self::update_from_42(); |
|
| 2240 | - if ($error != '') return $error; |
|
| 2241 | - else return self::check_version(true); |
|
| 2242 | - } else return ''; |
|
| 2243 | - } |
|
| 2244 | - else return $result['value']; |
|
| 2075 | + } |
|
| 2076 | + $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2077 | + if ($update) { |
|
| 2078 | + if ($result['value'] == '2') { |
|
| 2079 | + $error = self::update_from_2(); |
|
| 2080 | + if ($error != '') return $error; |
|
| 2081 | + else return self::check_version(true); |
|
| 2082 | + } elseif ($result['value'] == '3') { |
|
| 2083 | + $error = self::update_from_3(); |
|
| 2084 | + if ($error != '') return $error; |
|
| 2085 | + else return self::check_version(true); |
|
| 2086 | + } elseif ($result['value'] == '4') { |
|
| 2087 | + $error = self::update_from_4(); |
|
| 2088 | + if ($error != '') return $error; |
|
| 2089 | + else return self::check_version(true); |
|
| 2090 | + } elseif ($result['value'] == '5') { |
|
| 2091 | + $error = self::update_from_5(); |
|
| 2092 | + if ($error != '') return $error; |
|
| 2093 | + else return self::check_version(true); |
|
| 2094 | + } elseif ($result['value'] == '6') { |
|
| 2095 | + $error = self::update_from_6(); |
|
| 2096 | + if ($error != '') return $error; |
|
| 2097 | + else return self::check_version(true); |
|
| 2098 | + } elseif ($result['value'] == '7') { |
|
| 2099 | + $error = self::update_from_7(); |
|
| 2100 | + if ($error != '') return $error; |
|
| 2101 | + else return self::check_version(true); |
|
| 2102 | + } elseif ($result['value'] == '8') { |
|
| 2103 | + $error = self::update_from_8(); |
|
| 2104 | + if ($error != '') return $error; |
|
| 2105 | + else return self::check_version(true); |
|
| 2106 | + } elseif ($result['value'] == '9') { |
|
| 2107 | + $error = self::update_from_9(); |
|
| 2108 | + if ($error != '') return $error; |
|
| 2109 | + else return self::check_version(true); |
|
| 2110 | + } elseif ($result['value'] == '10') { |
|
| 2111 | + $error = self::update_from_10(); |
|
| 2112 | + if ($error != '') return $error; |
|
| 2113 | + else return self::check_version(true); |
|
| 2114 | + } elseif ($result['value'] == '11') { |
|
| 2115 | + $error = self::update_from_11(); |
|
| 2116 | + if ($error != '') return $error; |
|
| 2117 | + else return self::check_version(true); |
|
| 2118 | + } elseif ($result['value'] == '12') { |
|
| 2119 | + $error = self::update_from_12(); |
|
| 2120 | + if ($error != '') return $error; |
|
| 2121 | + else return self::check_version(true); |
|
| 2122 | + } elseif ($result['value'] == '13') { |
|
| 2123 | + $error = self::update_from_13(); |
|
| 2124 | + if ($error != '') return $error; |
|
| 2125 | + else return self::check_version(true); |
|
| 2126 | + } elseif ($result['value'] == '14') { |
|
| 2127 | + $error = self::update_from_14(); |
|
| 2128 | + if ($error != '') return $error; |
|
| 2129 | + else return self::check_version(true); |
|
| 2130 | + } elseif ($result['value'] == '15') { |
|
| 2131 | + $error = self::update_from_15(); |
|
| 2132 | + if ($error != '') return $error; |
|
| 2133 | + else return self::check_version(true); |
|
| 2134 | + } elseif ($result['value'] == '16') { |
|
| 2135 | + $error = self::update_from_16(); |
|
| 2136 | + if ($error != '') return $error; |
|
| 2137 | + else return self::check_version(true); |
|
| 2138 | + } elseif ($result['value'] == '17') { |
|
| 2139 | + $error = self::update_from_17(); |
|
| 2140 | + if ($error != '') return $error; |
|
| 2141 | + else return self::check_version(true); |
|
| 2142 | + } elseif ($result['value'] == '18') { |
|
| 2143 | + $error = self::update_from_18(); |
|
| 2144 | + if ($error != '') return $error; |
|
| 2145 | + else return self::check_version(true); |
|
| 2146 | + } elseif ($result['value'] == '19') { |
|
| 2147 | + $error = self::update_from_19(); |
|
| 2148 | + if ($error != '') return $error; |
|
| 2149 | + else return self::check_version(true); |
|
| 2150 | + } elseif ($result['value'] == '20') { |
|
| 2151 | + $error = self::update_from_20(); |
|
| 2152 | + if ($error != '') return $error; |
|
| 2153 | + else return self::check_version(true); |
|
| 2154 | + } elseif ($result['value'] == '21') { |
|
| 2155 | + $error = self::update_from_21(); |
|
| 2156 | + if ($error != '') return $error; |
|
| 2157 | + else return self::check_version(true); |
|
| 2158 | + } elseif ($result['value'] == '22') { |
|
| 2159 | + $error = self::update_from_22(); |
|
| 2160 | + if ($error != '') return $error; |
|
| 2161 | + else return self::check_version(true); |
|
| 2162 | + } elseif ($result['value'] == '23') { |
|
| 2163 | + $error = self::update_from_23(); |
|
| 2164 | + if ($error != '') return $error; |
|
| 2165 | + else return self::check_version(true); |
|
| 2166 | + } elseif ($result['value'] == '24') { |
|
| 2167 | + $error = self::update_from_24(); |
|
| 2168 | + if ($error != '') return $error; |
|
| 2169 | + else return self::check_version(true); |
|
| 2170 | + } elseif ($result['value'] == '25') { |
|
| 2171 | + $error = self::update_from_25(); |
|
| 2172 | + if ($error != '') return $error; |
|
| 2173 | + else return self::check_version(true); |
|
| 2174 | + } elseif ($result['value'] == '26') { |
|
| 2175 | + $error = self::update_from_26(); |
|
| 2176 | + if ($error != '') return $error; |
|
| 2177 | + else return self::check_version(true); |
|
| 2178 | + } elseif ($result['value'] == '27') { |
|
| 2179 | + $error = self::update_from_27(); |
|
| 2180 | + if ($error != '') return $error; |
|
| 2181 | + else return self::check_version(true); |
|
| 2182 | + } elseif ($result['value'] == '28') { |
|
| 2183 | + $error = self::update_from_28(); |
|
| 2184 | + if ($error != '') return $error; |
|
| 2185 | + else return self::check_version(true); |
|
| 2186 | + } elseif ($result['value'] == '29') { |
|
| 2187 | + $error = self::update_from_29(); |
|
| 2188 | + if ($error != '') return $error; |
|
| 2189 | + else return self::check_version(true); |
|
| 2190 | + } elseif ($result['value'] == '30') { |
|
| 2191 | + $error = self::update_from_30(); |
|
| 2192 | + if ($error != '') return $error; |
|
| 2193 | + else return self::check_version(true); |
|
| 2194 | + } elseif ($result['value'] == '31') { |
|
| 2195 | + $error = self::update_from_31(); |
|
| 2196 | + if ($error != '') return $error; |
|
| 2197 | + else return self::check_version(true); |
|
| 2198 | + } elseif ($result['value'] == '32') { |
|
| 2199 | + $error = self::update_from_32(); |
|
| 2200 | + if ($error != '') return $error; |
|
| 2201 | + else return self::check_version(true); |
|
| 2202 | + } elseif ($result['value'] == '33') { |
|
| 2203 | + $error = self::update_from_33(); |
|
| 2204 | + if ($error != '') return $error; |
|
| 2205 | + else return self::check_version(true); |
|
| 2206 | + } elseif ($result['value'] == '34') { |
|
| 2207 | + $error = self::update_from_34(); |
|
| 2208 | + if ($error != '') return $error; |
|
| 2209 | + else return self::check_version(true); |
|
| 2210 | + } elseif ($result['value'] == '35') { |
|
| 2211 | + $error = self::update_from_35(); |
|
| 2212 | + if ($error != '') return $error; |
|
| 2213 | + else return self::check_version(true); |
|
| 2214 | + } elseif ($result['value'] == '36') { |
|
| 2215 | + $error = self::update_from_36(); |
|
| 2216 | + if ($error != '') return $error; |
|
| 2217 | + else return self::check_version(true); |
|
| 2218 | + } elseif ($result['value'] == '37') { |
|
| 2219 | + $error = self::update_from_37(); |
|
| 2220 | + if ($error != '') return $error; |
|
| 2221 | + else return self::check_version(true); |
|
| 2222 | + } elseif ($result['value'] == '38') { |
|
| 2223 | + $error = self::update_from_38(); |
|
| 2224 | + if ($error != '') return $error; |
|
| 2225 | + else return self::check_version(true); |
|
| 2226 | + } elseif ($result['value'] == '39') { |
|
| 2227 | + $error = self::update_from_39(); |
|
| 2228 | + if ($error != '') return $error; |
|
| 2229 | + else return self::check_version(true); |
|
| 2230 | + } elseif ($result['value'] == '40') { |
|
| 2231 | + $error = self::update_from_40(); |
|
| 2232 | + if ($error != '') return $error; |
|
| 2233 | + else return self::check_version(true); |
|
| 2234 | + } elseif ($result['value'] == '41') { |
|
| 2235 | + $error = self::update_from_41(); |
|
| 2236 | + if ($error != '') return $error; |
|
| 2237 | + else return self::check_version(true); |
|
| 2238 | + } elseif ($result['value'] == '42') { |
|
| 2239 | + $error = self::update_from_42(); |
|
| 2240 | + if ($error != '') return $error; |
|
| 2241 | + else return self::check_version(true); |
|
| 2242 | + } else return ''; |
|
| 2243 | + } |
|
| 2244 | + else return $result['value']; |
|
| 2245 | 2245 | } |
| 2246 | 2246 | |
| 2247 | - } else return $version; |
|
| 2248 | - } |
|
| 2247 | + } else return $version; |
|
| 2248 | + } |
|
| 2249 | 2249 | |
| 2250 | 2250 | } |
| 2251 | 2251 | //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; |
@@ -1696,7 +1696,7 @@ discard block |
||
| 1696 | 1696 | try { |
| 1697 | 1697 | $sth = $Connection->db->prepare($query); |
| 1698 | 1698 | $sth->execute(); |
| 1699 | - } catch(PDOException $e) { |
|
| 1699 | + } catch (PDOException $e) { |
|
| 1700 | 1700 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 1701 | 1701 | } |
| 1702 | 1702 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -1705,18 +1705,18 @@ discard block |
||
| 1705 | 1705 | try { |
| 1706 | 1706 | $sth = $Connection->db->prepare($query); |
| 1707 | 1707 | $sth->execute(); |
| 1708 | - } catch(PDOException $e) { |
|
| 1708 | + } catch (PDOException $e) { |
|
| 1709 | 1709 | return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n"; |
| 1710 | 1710 | } |
| 1711 | 1711 | } |
| 1712 | 1712 | } |
| 1713 | - if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { |
|
| 1713 | + if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) { |
|
| 1714 | 1714 | // Add index key |
| 1715 | 1715 | $query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)"; |
| 1716 | 1716 | try { |
| 1717 | 1717 | $sth = $Connection->db->prepare($query); |
| 1718 | 1718 | $sth->execute(); |
| 1719 | - } catch(PDOException $e) { |
|
| 1719 | + } catch (PDOException $e) { |
|
| 1720 | 1720 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1721 | 1721 | } |
| 1722 | 1722 | } |
@@ -1724,7 +1724,7 @@ discard block |
||
| 1724 | 1724 | try { |
| 1725 | 1725 | $sth = $Connection->db->prepare($query); |
| 1726 | 1726 | $sth->execute(); |
| 1727 | - } catch(PDOException $e) { |
|
| 1727 | + } catch (PDOException $e) { |
|
| 1728 | 1728 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1729 | 1729 | } |
| 1730 | 1730 | return $error; |
@@ -1735,148 +1735,148 @@ discard block |
||
| 1735 | 1735 | $Connection = new Connection(); |
| 1736 | 1736 | $error = ''; |
| 1737 | 1737 | if ($globalDBdriver == 'mysql') { |
| 1738 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1738 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1739 | 1739 | $query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1740 | 1740 | try { |
| 1741 | 1741 | $sth = $Connection->db->prepare($query); |
| 1742 | 1742 | $sth->execute(); |
| 1743 | - } catch(PDOException $e) { |
|
| 1743 | + } catch (PDOException $e) { |
|
| 1744 | 1744 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1745 | 1745 | } |
| 1746 | 1746 | } |
| 1747 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1747 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1748 | 1748 | $query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1749 | 1749 | try { |
| 1750 | 1750 | $sth = $Connection->db->prepare($query); |
| 1751 | 1751 | $sth->execute(); |
| 1752 | - } catch(PDOException $e) { |
|
| 1752 | + } catch (PDOException $e) { |
|
| 1753 | 1753 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1754 | 1754 | } |
| 1755 | 1755 | } |
| 1756 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1756 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1757 | 1757 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1758 | 1758 | try { |
| 1759 | 1759 | $sth = $Connection->db->prepare($query); |
| 1760 | 1760 | $sth->execute(); |
| 1761 | - } catch(PDOException $e) { |
|
| 1761 | + } catch (PDOException $e) { |
|
| 1762 | 1762 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1763 | 1763 | } |
| 1764 | 1764 | } |
| 1765 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1765 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1766 | 1766 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1767 | 1767 | try { |
| 1768 | 1768 | $sth = $Connection->db->prepare($query); |
| 1769 | 1769 | $sth->execute(); |
| 1770 | - } catch(PDOException $e) { |
|
| 1770 | + } catch (PDOException $e) { |
|
| 1771 | 1771 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1772 | 1772 | } |
| 1773 | 1773 | } |
| 1774 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1774 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1775 | 1775 | $query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1776 | 1776 | try { |
| 1777 | 1777 | $sth = $Connection->db->prepare($query); |
| 1778 | 1778 | $sth->execute(); |
| 1779 | - } catch(PDOException $e) { |
|
| 1779 | + } catch (PDOException $e) { |
|
| 1780 | 1780 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1781 | 1781 | } |
| 1782 | 1782 | } |
| 1783 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1783 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1784 | 1784 | $query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1785 | 1785 | try { |
| 1786 | 1786 | $sth = $Connection->db->prepare($query); |
| 1787 | 1787 | $sth->execute(); |
| 1788 | - } catch(PDOException $e) { |
|
| 1788 | + } catch (PDOException $e) { |
|
| 1789 | 1789 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1790 | 1790 | } |
| 1791 | 1791 | } |
| 1792 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1792 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1793 | 1793 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1794 | 1794 | try { |
| 1795 | 1795 | $sth = $Connection->db->prepare($query); |
| 1796 | 1796 | $sth->execute(); |
| 1797 | - } catch(PDOException $e) { |
|
| 1797 | + } catch (PDOException $e) { |
|
| 1798 | 1798 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1799 | 1799 | } |
| 1800 | 1800 | } |
| 1801 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1801 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1802 | 1802 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1803 | 1803 | try { |
| 1804 | 1804 | $sth = $Connection->db->prepare($query); |
| 1805 | 1805 | $sth->execute(); |
| 1806 | - } catch(PDOException $e) { |
|
| 1806 | + } catch (PDOException $e) { |
|
| 1807 | 1807 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1808 | 1808 | } |
| 1809 | 1809 | } |
| 1810 | 1810 | } else { |
| 1811 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1811 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1812 | 1812 | $query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1813 | 1813 | try { |
| 1814 | 1814 | $sth = $Connection->db->prepare($query); |
| 1815 | 1815 | $sth->execute(); |
| 1816 | - } catch(PDOException $e) { |
|
| 1816 | + } catch (PDOException $e) { |
|
| 1817 | 1817 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1818 | 1818 | } |
| 1819 | 1819 | } |
| 1820 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1820 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1821 | 1821 | $query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL"; |
| 1822 | 1822 | try { |
| 1823 | 1823 | $sth = $Connection->db->prepare($query); |
| 1824 | 1824 | $sth->execute(); |
| 1825 | - } catch(PDOException $e) { |
|
| 1825 | + } catch (PDOException $e) { |
|
| 1826 | 1826 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1827 | 1827 | } |
| 1828 | 1828 | } |
| 1829 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1829 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1830 | 1830 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL"; |
| 1831 | 1831 | try { |
| 1832 | 1832 | $sth = $Connection->db->prepare($query); |
| 1833 | 1833 | $sth->execute(); |
| 1834 | - } catch(PDOException $e) { |
|
| 1834 | + } catch (PDOException $e) { |
|
| 1835 | 1835 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1836 | 1836 | } |
| 1837 | 1837 | } |
| 1838 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1838 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1839 | 1839 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1840 | 1840 | try { |
| 1841 | 1841 | $sth = $Connection->db->prepare($query); |
| 1842 | 1842 | $sth->execute(); |
| 1843 | - } catch(PDOException $e) { |
|
| 1843 | + } catch (PDOException $e) { |
|
| 1844 | 1844 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1845 | 1845 | } |
| 1846 | 1846 | } |
| 1847 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1847 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1848 | 1848 | $query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1849 | 1849 | try { |
| 1850 | 1850 | $sth = $Connection->db->prepare($query); |
| 1851 | 1851 | $sth->execute(); |
| 1852 | - } catch(PDOException $e) { |
|
| 1852 | + } catch (PDOException $e) { |
|
| 1853 | 1853 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1854 | 1854 | } |
| 1855 | 1855 | } |
| 1856 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1856 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1857 | 1857 | $query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL"; |
| 1858 | 1858 | try { |
| 1859 | 1859 | $sth = $Connection->db->prepare($query); |
| 1860 | 1860 | $sth->execute(); |
| 1861 | - } catch(PDOException $e) { |
|
| 1861 | + } catch (PDOException $e) { |
|
| 1862 | 1862 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1863 | 1863 | } |
| 1864 | 1864 | } |
| 1865 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1865 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1866 | 1866 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL"; |
| 1867 | 1867 | try { |
| 1868 | 1868 | $sth = $Connection->db->prepare($query); |
| 1869 | 1869 | $sth->execute(); |
| 1870 | - } catch(PDOException $e) { |
|
| 1870 | + } catch (PDOException $e) { |
|
| 1871 | 1871 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1872 | 1872 | } |
| 1873 | 1873 | } |
| 1874 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1874 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1875 | 1875 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1876 | 1876 | try { |
| 1877 | 1877 | $sth = $Connection->db->prepare($query); |
| 1878 | 1878 | $sth->execute(); |
| 1879 | - } catch(PDOException $e) { |
|
| 1879 | + } catch (PDOException $e) { |
|
| 1880 | 1880 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1881 | 1881 | } |
| 1882 | 1882 | } |
@@ -1885,7 +1885,7 @@ discard block |
||
| 1885 | 1885 | try { |
| 1886 | 1886 | $sth = $Connection->db->prepare($query); |
| 1887 | 1887 | $sth->execute(); |
| 1888 | - } catch(PDOException $e) { |
|
| 1888 | + } catch (PDOException $e) { |
|
| 1889 | 1889 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1890 | 1890 | } |
| 1891 | 1891 | return $error; |
@@ -1900,14 +1900,14 @@ discard block |
||
| 1900 | 1900 | try { |
| 1901 | 1901 | $sth = $Connection->db->prepare($query); |
| 1902 | 1902 | $sth->execute(); |
| 1903 | - } catch(PDOException $e) { |
|
| 1903 | + } catch (PDOException $e) { |
|
| 1904 | 1904 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1905 | 1905 | } |
| 1906 | 1906 | $query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL"; |
| 1907 | 1907 | try { |
| 1908 | 1908 | $sth = $Connection->db->prepare($query); |
| 1909 | 1909 | $sth->execute(); |
| 1910 | - } catch(PDOException $e) { |
|
| 1910 | + } catch (PDOException $e) { |
|
| 1911 | 1911 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1912 | 1912 | } |
| 1913 | 1913 | } else { |
@@ -1915,14 +1915,14 @@ discard block |
||
| 1915 | 1915 | try { |
| 1916 | 1916 | $sth = $Connection->db->prepare($query); |
| 1917 | 1917 | $sth->execute(); |
| 1918 | - } catch(PDOException $e) { |
|
| 1918 | + } catch (PDOException $e) { |
|
| 1919 | 1919 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1920 | 1920 | } |
| 1921 | 1921 | $query = "alter table marine_identity alter column mmsi type varchar(255)"; |
| 1922 | 1922 | try { |
| 1923 | 1923 | $sth = $Connection->db->prepare($query); |
| 1924 | 1924 | $sth->execute(); |
| 1925 | - } catch(PDOException $e) { |
|
| 1925 | + } catch (PDOException $e) { |
|
| 1926 | 1926 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1927 | 1927 | } |
| 1928 | 1928 | } |
@@ -1930,7 +1930,7 @@ discard block |
||
| 1930 | 1930 | try { |
| 1931 | 1931 | $sth = $Connection->db->prepare($query); |
| 1932 | 1932 | $sth->execute(); |
| 1933 | - } catch(PDOException $e) { |
|
| 1933 | + } catch (PDOException $e) { |
|
| 1934 | 1934 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1935 | 1935 | } |
| 1936 | 1936 | return $error; |
@@ -1940,32 +1940,32 @@ discard block |
||
| 1940 | 1940 | global $globalDBdriver; |
| 1941 | 1941 | $Connection = new Connection(); |
| 1942 | 1942 | $error = ''; |
| 1943 | - if (!$Connection->checkColumnName('source_location','last_seen')) { |
|
| 1943 | + if (!$Connection->checkColumnName('source_location', 'last_seen')) { |
|
| 1944 | 1944 | $query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL"; |
| 1945 | 1945 | try { |
| 1946 | 1946 | $sth = $Connection->db->prepare($query); |
| 1947 | 1947 | $sth->execute(); |
| 1948 | - } catch(PDOException $e) { |
|
| 1948 | + } catch (PDOException $e) { |
|
| 1949 | 1949 | return "error (add column last_seen in source_location) : ".$e->getMessage()."\n"; |
| 1950 | 1950 | } |
| 1951 | 1951 | } |
| 1952 | 1952 | if ($globalDBdriver == 'mysql') { |
| 1953 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1953 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1954 | 1954 | $query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL"; |
| 1955 | 1955 | try { |
| 1956 | 1956 | $sth = $Connection->db->prepare($query); |
| 1957 | 1957 | $sth->execute(); |
| 1958 | - } catch(PDOException $e) { |
|
| 1958 | + } catch (PDOException $e) { |
|
| 1959 | 1959 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1960 | 1960 | } |
| 1961 | 1961 | } |
| 1962 | 1962 | } else { |
| 1963 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1963 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1964 | 1964 | $query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL"; |
| 1965 | 1965 | try { |
| 1966 | 1966 | $sth = $Connection->db->prepare($query); |
| 1967 | 1967 | $sth->execute(); |
| 1968 | - } catch(PDOException $e) { |
|
| 1968 | + } catch (PDOException $e) { |
|
| 1969 | 1969 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1970 | 1970 | } |
| 1971 | 1971 | } |
@@ -1974,7 +1974,7 @@ discard block |
||
| 1974 | 1974 | try { |
| 1975 | 1975 | $sth = $Connection->db->prepare($query); |
| 1976 | 1976 | $sth->execute(); |
| 1977 | - } catch(PDOException $e) { |
|
| 1977 | + } catch (PDOException $e) { |
|
| 1978 | 1978 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1979 | 1979 | } |
| 1980 | 1980 | return $error; |
@@ -1984,12 +1984,12 @@ discard block |
||
| 1984 | 1984 | global $globalDBdriver; |
| 1985 | 1985 | $Connection = new Connection(); |
| 1986 | 1986 | $error = ''; |
| 1987 | - if (!$Connection->checkColumnName('source_location','description')) { |
|
| 1987 | + if (!$Connection->checkColumnName('source_location', 'description')) { |
|
| 1988 | 1988 | $query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL"; |
| 1989 | 1989 | try { |
| 1990 | 1990 | $sth = $Connection->db->prepare($query); |
| 1991 | 1991 | $sth->execute(); |
| 1992 | - } catch(PDOException $e) { |
|
| 1992 | + } catch (PDOException $e) { |
|
| 1993 | 1993 | return "error (add column description in source_location) : ".$e->getMessage()."\n"; |
| 1994 | 1994 | } |
| 1995 | 1995 | } |
@@ -1997,7 +1997,7 @@ discard block |
||
| 1997 | 1997 | try { |
| 1998 | 1998 | $sth = $Connection->db->prepare($query); |
| 1999 | 1999 | $sth->execute(); |
| 2000 | - } catch(PDOException $e) { |
|
| 2000 | + } catch (PDOException $e) { |
|
| 2001 | 2001 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2002 | 2002 | } |
| 2003 | 2003 | return $error; |
@@ -2007,39 +2007,39 @@ discard block |
||
| 2007 | 2007 | global $globalDBdriver; |
| 2008 | 2008 | $Connection = new Connection(); |
| 2009 | 2009 | $error = ''; |
| 2010 | - if (!$Connection->checkColumnName('spotter_live','real_altitude')) { |
|
| 2010 | + if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) { |
|
| 2011 | 2011 | $query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2012 | 2012 | try { |
| 2013 | 2013 | $sth = $Connection->db->prepare($query); |
| 2014 | 2014 | $sth->execute(); |
| 2015 | - } catch(PDOException $e) { |
|
| 2015 | + } catch (PDOException $e) { |
|
| 2016 | 2016 | return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n"; |
| 2017 | 2017 | } |
| 2018 | 2018 | } |
| 2019 | - if (!$Connection->checkColumnName('spotter_output','real_altitude')) { |
|
| 2019 | + if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) { |
|
| 2020 | 2020 | $query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2021 | 2021 | try { |
| 2022 | 2022 | $sth = $Connection->db->prepare($query); |
| 2023 | 2023 | $sth->execute(); |
| 2024 | - } catch(PDOException $e) { |
|
| 2024 | + } catch (PDOException $e) { |
|
| 2025 | 2025 | return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n"; |
| 2026 | 2026 | } |
| 2027 | 2027 | } |
| 2028 | - if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) { |
|
| 2028 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) { |
|
| 2029 | 2029 | $query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2030 | 2030 | try { |
| 2031 | 2031 | $sth = $Connection->db->prepare($query); |
| 2032 | 2032 | $sth->execute(); |
| 2033 | - } catch(PDOException $e) { |
|
| 2033 | + } catch (PDOException $e) { |
|
| 2034 | 2034 | return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n"; |
| 2035 | 2035 | } |
| 2036 | 2036 | } |
| 2037 | - if (!$Connection->checkColumnName('spotter_archive','real_altitude')) { |
|
| 2037 | + if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) { |
|
| 2038 | 2038 | $query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2039 | 2039 | try { |
| 2040 | 2040 | $sth = $Connection->db->prepare($query); |
| 2041 | 2041 | $sth->execute(); |
| 2042 | - } catch(PDOException $e) { |
|
| 2042 | + } catch (PDOException $e) { |
|
| 2043 | 2043 | return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n"; |
| 2044 | 2044 | } |
| 2045 | 2045 | } |
@@ -2047,7 +2047,7 @@ discard block |
||
| 2047 | 2047 | try { |
| 2048 | 2048 | $sth = $Connection->db->prepare($query); |
| 2049 | 2049 | $sth->execute(); |
| 2050 | - } catch(PDOException $e) { |
|
| 2050 | + } catch (PDOException $e) { |
|
| 2051 | 2051 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2052 | 2052 | } |
| 2053 | 2053 | return $error; |
@@ -2070,7 +2070,7 @@ discard block |
||
| 2070 | 2070 | try { |
| 2071 | 2071 | $sth = $Connection->db->prepare($query); |
| 2072 | 2072 | $sth->execute(); |
| 2073 | - } catch(PDOException $e) { |
|
| 2073 | + } catch (PDOException $e) { |
|
| 2074 | 2074 | return "error : ".$e->getMessage()."\n"; |
| 2075 | 2075 | } |
| 2076 | 2076 | $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,35 +1751,55 @@ 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('marine_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 | } else { |
| 1683 | 1783 | $error .= create_db::import_file('../db/pgsql/marine_image.sql'); |
| 1684 | - if ($error != '') return $error; |
|
| 1784 | + if ($error != '') { |
|
| 1785 | + return $error; |
|
| 1786 | + } |
|
| 1685 | 1787 | $error .= create_db::import_file('../db/pgsql/marine_archive.sql'); |
| 1686 | - if ($error != '') return $error; |
|
| 1788 | + if ($error != '') { |
|
| 1789 | + return $error; |
|
| 1790 | + } |
|
| 1687 | 1791 | $error .= create_db::import_file('../db/pgsql/marine_archive_output.sql'); |
| 1688 | - if ($error != '') return $error; |
|
| 1792 | + if ($error != '') { |
|
| 1793 | + return $error; |
|
| 1794 | + } |
|
| 1689 | 1795 | $error .= create_db::import_file('../db/pgsql/tracker_archive.sql'); |
| 1690 | - if ($error != '') return $error; |
|
| 1796 | + if ($error != '') { |
|
| 1797 | + return $error; |
|
| 1798 | + } |
|
| 1691 | 1799 | $error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql'); |
| 1692 | - if ($error != '') return $error; |
|
| 1800 | + if ($error != '') { |
|
| 1801 | + return $error; |
|
| 1802 | + } |
|
| 1693 | 1803 | } |
| 1694 | 1804 | if ($globalDBdriver == 'mysql') { |
| 1695 | 1805 | $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
@@ -2062,8 +2172,11 @@ discard block |
||
| 2062 | 2172 | if ($Connection->tableExists('aircraft')) { |
| 2063 | 2173 | if (!$Connection->tableExists('config')) { |
| 2064 | 2174 | $version = '1'; |
| 2065 | - if ($update) return self::update_from_1(); |
|
| 2066 | - else return $version; |
|
| 2175 | + if ($update) { |
|
| 2176 | + return self::update_from_1(); |
|
| 2177 | + } else { |
|
| 2178 | + return $version; |
|
| 2179 | + } |
|
| 2067 | 2180 | } else { |
| 2068 | 2181 | $Connection = new Connection(); |
| 2069 | 2182 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
@@ -2077,174 +2190,302 @@ discard block |
||
| 2077 | 2190 | if ($update) { |
| 2078 | 2191 | if ($result['value'] == '2') { |
| 2079 | 2192 | $error = self::update_from_2(); |
| 2080 | - if ($error != '') return $error; |
|
| 2081 | - else return self::check_version(true); |
|
| 2193 | + if ($error != '') { |
|
| 2194 | + return $error; |
|
| 2195 | + } else { |
|
| 2196 | + return self::check_version(true); |
|
| 2197 | + } |
|
| 2082 | 2198 | } elseif ($result['value'] == '3') { |
| 2083 | 2199 | $error = self::update_from_3(); |
| 2084 | - if ($error != '') return $error; |
|
| 2085 | - else return self::check_version(true); |
|
| 2200 | + if ($error != '') { |
|
| 2201 | + return $error; |
|
| 2202 | + } else { |
|
| 2203 | + return self::check_version(true); |
|
| 2204 | + } |
|
| 2086 | 2205 | } elseif ($result['value'] == '4') { |
| 2087 | 2206 | $error = self::update_from_4(); |
| 2088 | - if ($error != '') return $error; |
|
| 2089 | - else return self::check_version(true); |
|
| 2207 | + if ($error != '') { |
|
| 2208 | + return $error; |
|
| 2209 | + } else { |
|
| 2210 | + return self::check_version(true); |
|
| 2211 | + } |
|
| 2090 | 2212 | } elseif ($result['value'] == '5') { |
| 2091 | 2213 | $error = self::update_from_5(); |
| 2092 | - if ($error != '') return $error; |
|
| 2093 | - else return self::check_version(true); |
|
| 2214 | + if ($error != '') { |
|
| 2215 | + return $error; |
|
| 2216 | + } else { |
|
| 2217 | + return self::check_version(true); |
|
| 2218 | + } |
|
| 2094 | 2219 | } elseif ($result['value'] == '6') { |
| 2095 | 2220 | $error = self::update_from_6(); |
| 2096 | - if ($error != '') return $error; |
|
| 2097 | - else return self::check_version(true); |
|
| 2221 | + if ($error != '') { |
|
| 2222 | + return $error; |
|
| 2223 | + } else { |
|
| 2224 | + return self::check_version(true); |
|
| 2225 | + } |
|
| 2098 | 2226 | } elseif ($result['value'] == '7') { |
| 2099 | 2227 | $error = self::update_from_7(); |
| 2100 | - if ($error != '') return $error; |
|
| 2101 | - else return self::check_version(true); |
|
| 2228 | + if ($error != '') { |
|
| 2229 | + return $error; |
|
| 2230 | + } else { |
|
| 2231 | + return self::check_version(true); |
|
| 2232 | + } |
|
| 2102 | 2233 | } elseif ($result['value'] == '8') { |
| 2103 | 2234 | $error = self::update_from_8(); |
| 2104 | - if ($error != '') return $error; |
|
| 2105 | - else return self::check_version(true); |
|
| 2235 | + if ($error != '') { |
|
| 2236 | + return $error; |
|
| 2237 | + } else { |
|
| 2238 | + return self::check_version(true); |
|
| 2239 | + } |
|
| 2106 | 2240 | } elseif ($result['value'] == '9') { |
| 2107 | 2241 | $error = self::update_from_9(); |
| 2108 | - if ($error != '') return $error; |
|
| 2109 | - else return self::check_version(true); |
|
| 2242 | + if ($error != '') { |
|
| 2243 | + return $error; |
|
| 2244 | + } else { |
|
| 2245 | + return self::check_version(true); |
|
| 2246 | + } |
|
| 2110 | 2247 | } elseif ($result['value'] == '10') { |
| 2111 | 2248 | $error = self::update_from_10(); |
| 2112 | - if ($error != '') return $error; |
|
| 2113 | - else return self::check_version(true); |
|
| 2249 | + if ($error != '') { |
|
| 2250 | + return $error; |
|
| 2251 | + } else { |
|
| 2252 | + return self::check_version(true); |
|
| 2253 | + } |
|
| 2114 | 2254 | } elseif ($result['value'] == '11') { |
| 2115 | 2255 | $error = self::update_from_11(); |
| 2116 | - if ($error != '') return $error; |
|
| 2117 | - else return self::check_version(true); |
|
| 2256 | + if ($error != '') { |
|
| 2257 | + return $error; |
|
| 2258 | + } else { |
|
| 2259 | + return self::check_version(true); |
|
| 2260 | + } |
|
| 2118 | 2261 | } elseif ($result['value'] == '12') { |
| 2119 | 2262 | $error = self::update_from_12(); |
| 2120 | - if ($error != '') return $error; |
|
| 2121 | - else return self::check_version(true); |
|
| 2263 | + if ($error != '') { |
|
| 2264 | + return $error; |
|
| 2265 | + } else { |
|
| 2266 | + return self::check_version(true); |
|
| 2267 | + } |
|
| 2122 | 2268 | } elseif ($result['value'] == '13') { |
| 2123 | 2269 | $error = self::update_from_13(); |
| 2124 | - if ($error != '') return $error; |
|
| 2125 | - else return self::check_version(true); |
|
| 2270 | + if ($error != '') { |
|
| 2271 | + return $error; |
|
| 2272 | + } else { |
|
| 2273 | + return self::check_version(true); |
|
| 2274 | + } |
|
| 2126 | 2275 | } elseif ($result['value'] == '14') { |
| 2127 | 2276 | $error = self::update_from_14(); |
| 2128 | - if ($error != '') return $error; |
|
| 2129 | - else return self::check_version(true); |
|
| 2277 | + if ($error != '') { |
|
| 2278 | + return $error; |
|
| 2279 | + } else { |
|
| 2280 | + return self::check_version(true); |
|
| 2281 | + } |
|
| 2130 | 2282 | } elseif ($result['value'] == '15') { |
| 2131 | 2283 | $error = self::update_from_15(); |
| 2132 | - if ($error != '') return $error; |
|
| 2133 | - else return self::check_version(true); |
|
| 2284 | + if ($error != '') { |
|
| 2285 | + return $error; |
|
| 2286 | + } else { |
|
| 2287 | + return self::check_version(true); |
|
| 2288 | + } |
|
| 2134 | 2289 | } elseif ($result['value'] == '16') { |
| 2135 | 2290 | $error = self::update_from_16(); |
| 2136 | - if ($error != '') return $error; |
|
| 2137 | - else return self::check_version(true); |
|
| 2291 | + if ($error != '') { |
|
| 2292 | + return $error; |
|
| 2293 | + } else { |
|
| 2294 | + return self::check_version(true); |
|
| 2295 | + } |
|
| 2138 | 2296 | } elseif ($result['value'] == '17') { |
| 2139 | 2297 | $error = self::update_from_17(); |
| 2140 | - if ($error != '') return $error; |
|
| 2141 | - else return self::check_version(true); |
|
| 2298 | + if ($error != '') { |
|
| 2299 | + return $error; |
|
| 2300 | + } else { |
|
| 2301 | + return self::check_version(true); |
|
| 2302 | + } |
|
| 2142 | 2303 | } elseif ($result['value'] == '18') { |
| 2143 | 2304 | $error = self::update_from_18(); |
| 2144 | - if ($error != '') return $error; |
|
| 2145 | - else return self::check_version(true); |
|
| 2305 | + if ($error != '') { |
|
| 2306 | + return $error; |
|
| 2307 | + } else { |
|
| 2308 | + return self::check_version(true); |
|
| 2309 | + } |
|
| 2146 | 2310 | } elseif ($result['value'] == '19') { |
| 2147 | 2311 | $error = self::update_from_19(); |
| 2148 | - if ($error != '') return $error; |
|
| 2149 | - else return self::check_version(true); |
|
| 2312 | + if ($error != '') { |
|
| 2313 | + return $error; |
|
| 2314 | + } else { |
|
| 2315 | + return self::check_version(true); |
|
| 2316 | + } |
|
| 2150 | 2317 | } elseif ($result['value'] == '20') { |
| 2151 | 2318 | $error = self::update_from_20(); |
| 2152 | - if ($error != '') return $error; |
|
| 2153 | - else return self::check_version(true); |
|
| 2319 | + if ($error != '') { |
|
| 2320 | + return $error; |
|
| 2321 | + } else { |
|
| 2322 | + return self::check_version(true); |
|
| 2323 | + } |
|
| 2154 | 2324 | } elseif ($result['value'] == '21') { |
| 2155 | 2325 | $error = self::update_from_21(); |
| 2156 | - if ($error != '') return $error; |
|
| 2157 | - else return self::check_version(true); |
|
| 2326 | + if ($error != '') { |
|
| 2327 | + return $error; |
|
| 2328 | + } else { |
|
| 2329 | + return self::check_version(true); |
|
| 2330 | + } |
|
| 2158 | 2331 | } elseif ($result['value'] == '22') { |
| 2159 | 2332 | $error = self::update_from_22(); |
| 2160 | - if ($error != '') return $error; |
|
| 2161 | - else return self::check_version(true); |
|
| 2333 | + if ($error != '') { |
|
| 2334 | + return $error; |
|
| 2335 | + } else { |
|
| 2336 | + return self::check_version(true); |
|
| 2337 | + } |
|
| 2162 | 2338 | } elseif ($result['value'] == '23') { |
| 2163 | 2339 | $error = self::update_from_23(); |
| 2164 | - if ($error != '') return $error; |
|
| 2165 | - else return self::check_version(true); |
|
| 2340 | + if ($error != '') { |
|
| 2341 | + return $error; |
|
| 2342 | + } else { |
|
| 2343 | + return self::check_version(true); |
|
| 2344 | + } |
|
| 2166 | 2345 | } elseif ($result['value'] == '24') { |
| 2167 | 2346 | $error = self::update_from_24(); |
| 2168 | - if ($error != '') return $error; |
|
| 2169 | - else return self::check_version(true); |
|
| 2347 | + if ($error != '') { |
|
| 2348 | + return $error; |
|
| 2349 | + } else { |
|
| 2350 | + return self::check_version(true); |
|
| 2351 | + } |
|
| 2170 | 2352 | } elseif ($result['value'] == '25') { |
| 2171 | 2353 | $error = self::update_from_25(); |
| 2172 | - if ($error != '') return $error; |
|
| 2173 | - else return self::check_version(true); |
|
| 2354 | + if ($error != '') { |
|
| 2355 | + return $error; |
|
| 2356 | + } else { |
|
| 2357 | + return self::check_version(true); |
|
| 2358 | + } |
|
| 2174 | 2359 | } elseif ($result['value'] == '26') { |
| 2175 | 2360 | $error = self::update_from_26(); |
| 2176 | - if ($error != '') return $error; |
|
| 2177 | - else return self::check_version(true); |
|
| 2361 | + if ($error != '') { |
|
| 2362 | + return $error; |
|
| 2363 | + } else { |
|
| 2364 | + return self::check_version(true); |
|
| 2365 | + } |
|
| 2178 | 2366 | } elseif ($result['value'] == '27') { |
| 2179 | 2367 | $error = self::update_from_27(); |
| 2180 | - if ($error != '') return $error; |
|
| 2181 | - else return self::check_version(true); |
|
| 2368 | + if ($error != '') { |
|
| 2369 | + return $error; |
|
| 2370 | + } else { |
|
| 2371 | + return self::check_version(true); |
|
| 2372 | + } |
|
| 2182 | 2373 | } elseif ($result['value'] == '28') { |
| 2183 | 2374 | $error = self::update_from_28(); |
| 2184 | - if ($error != '') return $error; |
|
| 2185 | - else return self::check_version(true); |
|
| 2375 | + if ($error != '') { |
|
| 2376 | + return $error; |
|
| 2377 | + } else { |
|
| 2378 | + return self::check_version(true); |
|
| 2379 | + } |
|
| 2186 | 2380 | } elseif ($result['value'] == '29') { |
| 2187 | 2381 | $error = self::update_from_29(); |
| 2188 | - if ($error != '') return $error; |
|
| 2189 | - else return self::check_version(true); |
|
| 2382 | + if ($error != '') { |
|
| 2383 | + return $error; |
|
| 2384 | + } else { |
|
| 2385 | + return self::check_version(true); |
|
| 2386 | + } |
|
| 2190 | 2387 | } elseif ($result['value'] == '30') { |
| 2191 | 2388 | $error = self::update_from_30(); |
| 2192 | - if ($error != '') return $error; |
|
| 2193 | - else return self::check_version(true); |
|
| 2389 | + if ($error != '') { |
|
| 2390 | + return $error; |
|
| 2391 | + } else { |
|
| 2392 | + return self::check_version(true); |
|
| 2393 | + } |
|
| 2194 | 2394 | } elseif ($result['value'] == '31') { |
| 2195 | 2395 | $error = self::update_from_31(); |
| 2196 | - if ($error != '') return $error; |
|
| 2197 | - else return self::check_version(true); |
|
| 2396 | + if ($error != '') { |
|
| 2397 | + return $error; |
|
| 2398 | + } else { |
|
| 2399 | + return self::check_version(true); |
|
| 2400 | + } |
|
| 2198 | 2401 | } elseif ($result['value'] == '32') { |
| 2199 | 2402 | $error = self::update_from_32(); |
| 2200 | - if ($error != '') return $error; |
|
| 2201 | - else return self::check_version(true); |
|
| 2403 | + if ($error != '') { |
|
| 2404 | + return $error; |
|
| 2405 | + } else { |
|
| 2406 | + return self::check_version(true); |
|
| 2407 | + } |
|
| 2202 | 2408 | } elseif ($result['value'] == '33') { |
| 2203 | 2409 | $error = self::update_from_33(); |
| 2204 | - if ($error != '') return $error; |
|
| 2205 | - else return self::check_version(true); |
|
| 2410 | + if ($error != '') { |
|
| 2411 | + return $error; |
|
| 2412 | + } else { |
|
| 2413 | + return self::check_version(true); |
|
| 2414 | + } |
|
| 2206 | 2415 | } elseif ($result['value'] == '34') { |
| 2207 | 2416 | $error = self::update_from_34(); |
| 2208 | - if ($error != '') return $error; |
|
| 2209 | - else return self::check_version(true); |
|
| 2417 | + if ($error != '') { |
|
| 2418 | + return $error; |
|
| 2419 | + } else { |
|
| 2420 | + return self::check_version(true); |
|
| 2421 | + } |
|
| 2210 | 2422 | } elseif ($result['value'] == '35') { |
| 2211 | 2423 | $error = self::update_from_35(); |
| 2212 | - if ($error != '') return $error; |
|
| 2213 | - else return self::check_version(true); |
|
| 2424 | + if ($error != '') { |
|
| 2425 | + return $error; |
|
| 2426 | + } else { |
|
| 2427 | + return self::check_version(true); |
|
| 2428 | + } |
|
| 2214 | 2429 | } elseif ($result['value'] == '36') { |
| 2215 | 2430 | $error = self::update_from_36(); |
| 2216 | - if ($error != '') return $error; |
|
| 2217 | - else return self::check_version(true); |
|
| 2431 | + if ($error != '') { |
|
| 2432 | + return $error; |
|
| 2433 | + } else { |
|
| 2434 | + return self::check_version(true); |
|
| 2435 | + } |
|
| 2218 | 2436 | } elseif ($result['value'] == '37') { |
| 2219 | 2437 | $error = self::update_from_37(); |
| 2220 | - if ($error != '') return $error; |
|
| 2221 | - else return self::check_version(true); |
|
| 2438 | + if ($error != '') { |
|
| 2439 | + return $error; |
|
| 2440 | + } else { |
|
| 2441 | + return self::check_version(true); |
|
| 2442 | + } |
|
| 2222 | 2443 | } elseif ($result['value'] == '38') { |
| 2223 | 2444 | $error = self::update_from_38(); |
| 2224 | - if ($error != '') return $error; |
|
| 2225 | - else return self::check_version(true); |
|
| 2445 | + if ($error != '') { |
|
| 2446 | + return $error; |
|
| 2447 | + } else { |
|
| 2448 | + return self::check_version(true); |
|
| 2449 | + } |
|
| 2226 | 2450 | } elseif ($result['value'] == '39') { |
| 2227 | 2451 | $error = self::update_from_39(); |
| 2228 | - if ($error != '') return $error; |
|
| 2229 | - else return self::check_version(true); |
|
| 2452 | + if ($error != '') { |
|
| 2453 | + return $error; |
|
| 2454 | + } else { |
|
| 2455 | + return self::check_version(true); |
|
| 2456 | + } |
|
| 2230 | 2457 | } elseif ($result['value'] == '40') { |
| 2231 | 2458 | $error = self::update_from_40(); |
| 2232 | - if ($error != '') return $error; |
|
| 2233 | - else return self::check_version(true); |
|
| 2459 | + if ($error != '') { |
|
| 2460 | + return $error; |
|
| 2461 | + } else { |
|
| 2462 | + return self::check_version(true); |
|
| 2463 | + } |
|
| 2234 | 2464 | } elseif ($result['value'] == '41') { |
| 2235 | 2465 | $error = self::update_from_41(); |
| 2236 | - if ($error != '') return $error; |
|
| 2237 | - else return self::check_version(true); |
|
| 2466 | + if ($error != '') { |
|
| 2467 | + return $error; |
|
| 2468 | + } else { |
|
| 2469 | + return self::check_version(true); |
|
| 2470 | + } |
|
| 2238 | 2471 | } elseif ($result['value'] == '42') { |
| 2239 | 2472 | $error = self::update_from_42(); |
| 2240 | - if ($error != '') return $error; |
|
| 2241 | - else return self::check_version(true); |
|
| 2242 | - } else return ''; |
|
| 2473 | + if ($error != '') { |
|
| 2474 | + return $error; |
|
| 2475 | + } else { |
|
| 2476 | + return self::check_version(true); |
|
| 2477 | + } |
|
| 2478 | + } else { |
|
| 2479 | + return ''; |
|
| 2480 | + } |
|
| 2481 | + } else { |
|
| 2482 | + return $result['value']; |
|
| 2243 | 2483 | } |
| 2244 | - else return $result['value']; |
|
| 2245 | 2484 | } |
| 2246 | 2485 | |
| 2247 | - } else return $version; |
|
| 2486 | + } else { |
|
| 2487 | + return $version; |
|
| 2488 | + } |
|
| 2248 | 2489 | } |
| 2249 | 2490 | |
| 2250 | 2491 | } |
@@ -131,45 +131,72 @@ discard block |
||
| 131 | 131 | </div> |
| 132 | 132 | <p> |
| 133 | 133 | <label for="dbhost">Database hostname</label> |
| 134 | - <input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) print $globalDBhost; ?>" /> |
|
| 134 | + <input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) { |
|
| 135 | + print $globalDBhost; |
|
| 136 | +} |
|
| 137 | +?>" /> |
|
| 135 | 138 | </p> |
| 136 | 139 | <p> |
| 137 | 140 | <label for="dbport">Database port</label> |
| 138 | - <input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) print $globalDBport; ?>" /> |
|
| 141 | + <input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) { |
|
| 142 | + print $globalDBport; |
|
| 143 | +} |
|
| 144 | +?>" /> |
|
| 139 | 145 | <p class="help-block">Default is 3306 for MariaDB/MySQL, 5432 for PostgreSQL</p> |
| 140 | 146 | </p> |
| 141 | 147 | <p> |
| 142 | 148 | <label for="dbname">Database name</label> |
| 143 | - <input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) print $globalDBname; ?>" /> |
|
| 149 | + <input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) { |
|
| 150 | + print $globalDBname; |
|
| 151 | +} |
|
| 152 | +?>" /> |
|
| 144 | 153 | </p> |
| 145 | 154 | <p> |
| 146 | 155 | <label for="dbuser">Database user</label> |
| 147 | - <input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) print $globalDBuser; ?>" /> |
|
| 156 | + <input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) { |
|
| 157 | + print $globalDBuser; |
|
| 158 | +} |
|
| 159 | +?>" /> |
|
| 148 | 160 | </p> |
| 149 | 161 | <p> |
| 150 | 162 | <label for="dbuserpass">Database user password</label> |
| 151 | - <input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) print $globalDBpass; ?>" /> |
|
| 163 | + <input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) { |
|
| 164 | + print $globalDBpass; |
|
| 165 | +} |
|
| 166 | +?>" /> |
|
| 152 | 167 | </p> |
| 153 | 168 | </fieldset> |
| 154 | 169 | <fieldset id="site"> |
| 155 | 170 | <legend>Site configuration</legend> |
| 156 | 171 | <p> |
| 157 | 172 | <label for="sitename">Site name</label> |
| 158 | - <input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) print $globalName; ?>" /> |
|
| 173 | + <input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) { |
|
| 174 | + print $globalName; |
|
| 175 | +} |
|
| 176 | +?>" /> |
|
| 159 | 177 | </p> |
| 160 | 178 | <p> |
| 161 | 179 | <label for="siteurl">Site directory</label> |
| 162 | - <input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" /> |
|
| 180 | + <input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) { |
|
| 181 | + print $globalURL; |
|
| 182 | +} |
|
| 183 | +?>" /> |
|
| 163 | 184 | <p class="help-block">Can be null. ex : <i>flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p> |
| 164 | 185 | </p> |
| 165 | 186 | <p> |
| 166 | 187 | <label for="timezone">Timezone</label> |
| 167 | - <input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) print $globalTimezone; ?>" /> |
|
| 188 | + <input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) { |
|
| 189 | + print $globalTimezone; |
|
| 190 | +} |
|
| 191 | +?>" /> |
|
| 168 | 192 | <p class="help-block">ex : UTC, Europe/Paris,...</p> |
| 169 | 193 | </p> |
| 170 | 194 | <p> |
| 171 | 195 | <label for="language">Language</label> |
| 172 | - <input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) print $globalLanguage; ?>" /> |
|
| 196 | + <input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) { |
|
| 197 | + print $globalLanguage; |
|
| 198 | +} |
|
| 199 | +?>" /> |
|
| 173 | 200 | <p class="help-block">Used only when link to wikipedia for now. Can be EN,DE,FR,...</p> |
| 174 | 201 | </p> |
| 175 | 202 | </fieldset> |
@@ -190,11 +217,17 @@ discard block |
||
| 190 | 217 | <div id="mapbox_data"> |
| 191 | 218 | <p> |
| 192 | 219 | <label for="mapboxid">Mapbox id</label> |
| 193 | - <input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) print $globalMapboxId; ?>" /> |
|
| 220 | + <input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) { |
|
| 221 | + print $globalMapboxId; |
|
| 222 | +} |
|
| 223 | +?>" /> |
|
| 194 | 224 | </p> |
| 195 | 225 | <p> |
| 196 | 226 | <label for="mapboxtoken">Mapbox token</label> |
| 197 | - <input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) print $globalMapboxToken; ?>" /> |
|
| 227 | + <input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) { |
|
| 228 | + print $globalMapboxToken; |
|
| 229 | +} |
|
| 230 | +?>" /> |
|
| 198 | 231 | </p> |
| 199 | 232 | <p class="help-block">Get a key <a href="https://www.mapbox.com/developers/">here</a></p> |
| 200 | 233 | </div> |
@@ -202,7 +235,10 @@ discard block |
||
| 202 | 235 | <div id="google_data"> |
| 203 | 236 | <p> |
| 204 | 237 | <label for="googlekey">Google API key</label> |
| 205 | - <input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) print $globalGoogleAPIKey; ?>" /> |
|
| 238 | + <input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) { |
|
| 239 | + print $globalGoogleAPIKey; |
|
| 240 | +} |
|
| 241 | +?>" /> |
|
| 206 | 242 | <p class="help-block">Get a key <a href="https://developers.google.com/maps/documentation/javascript/get-api-key#get-an-api-key">here</a></p> |
| 207 | 243 | </p> |
| 208 | 244 | </div> |
@@ -210,7 +246,10 @@ discard block |
||
| 210 | 246 | <div id="bing_data"> |
| 211 | 247 | <p> |
| 212 | 248 | <label for="bingkey">Bing Map key</label> |
| 213 | - <input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) print $globalBingMapKey; ?>" /> |
|
| 249 | + <input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) { |
|
| 250 | + print $globalBingMapKey; |
|
| 251 | +} |
|
| 252 | +?>" /> |
|
| 214 | 253 | <p class="help-block">Get a key <a href="https://www.bingmapsportal.com/">here</a></p> |
| 215 | 254 | </p> |
| 216 | 255 | </div> |
@@ -218,7 +257,10 @@ discard block |
||
| 218 | 257 | <div id="mapquest_data"> |
| 219 | 258 | <p> |
| 220 | 259 | <label for="mapquestkey">MapQuest key</label> |
| 221 | - <input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) print $globalMapQuestKey; ?>" /> |
|
| 260 | + <input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) { |
|
| 261 | + print $globalMapQuestKey; |
|
| 262 | +} |
|
| 263 | +?>" /> |
|
| 222 | 264 | <p class="help-block">Get a key <a href="https://developer.mapquest.com/user/me/apps">here</a></p> |
| 223 | 265 | </p> |
| 224 | 266 | </div> |
@@ -226,11 +268,17 @@ discard block |
||
| 226 | 268 | <div id="here_data"> |
| 227 | 269 | <p> |
| 228 | 270 | <label for="hereappid">Here App_Id</label> |
| 229 | - <input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) print $globalHereappId; ?>" /> |
|
| 271 | + <input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) { |
|
| 272 | + print $globalHereappId; |
|
| 273 | +} |
|
| 274 | +?>" /> |
|
| 230 | 275 | </p> |
| 231 | 276 | <p> |
| 232 | 277 | <label for="hereappcode">Here App_Code</label> |
| 233 | - <input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) print $globalHereappCode; ?>" /> |
|
| 278 | + <input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) { |
|
| 279 | + print $globalHereappCode; |
|
| 280 | +} |
|
| 281 | +?>" /> |
|
| 234 | 282 | </p> |
| 235 | 283 | <p class="help-block">Get a key <a href="https://developer.here.com/rest-apis/documentation/enterprise-map-tile/topics/quick-start.html">here</a></p> |
| 236 | 284 | </div> |
@@ -239,42 +287,86 @@ discard block |
||
| 239 | 287 | <legend>Coverage area</legend> |
| 240 | 288 | <p> |
| 241 | 289 | <label for="latitudemax">The maximum latitude (north)</label> |
| 242 | - <input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) print $globalLatitudeMax; ?>" /> |
|
| 290 | + <input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) { |
|
| 291 | + print $globalLatitudeMax; |
|
| 292 | +} |
|
| 293 | +?>" /> |
|
| 243 | 294 | </p> |
| 244 | 295 | <p> |
| 245 | 296 | <label for="latitudemin">The minimum latitude (south)</label> |
| 246 | - <input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) print $globalLatitudeMin; ?>" /> |
|
| 297 | + <input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) { |
|
| 298 | + print $globalLatitudeMin; |
|
| 299 | +} |
|
| 300 | +?>" /> |
|
| 247 | 301 | </p> |
| 248 | 302 | <p> |
| 249 | 303 | <label for="longitudemax">The maximum longitude (west)</label> |
| 250 | - <input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) print $globalLongitudeMax; ?>" /> |
|
| 304 | + <input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) { |
|
| 305 | + print $globalLongitudeMax; |
|
| 306 | +} |
|
| 307 | +?>" /> |
|
| 251 | 308 | </p> |
| 252 | 309 | <p> |
| 253 | 310 | <label for="longitudemin">The minimum longitude (east)</label> |
| 254 | - <input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) print $globalLongitudeMin; ?>" /> |
|
| 311 | + <input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) { |
|
| 312 | + print $globalLongitudeMin; |
|
| 313 | +} |
|
| 314 | +?>" /> |
|
| 255 | 315 | </p> |
| 256 | 316 | <p> |
| 257 | 317 | <label for="latitudecenter">The latitude center</label> |
| 258 | - <input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) print $globalCenterLatitude; ?>" /> |
|
| 318 | + <input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) { |
|
| 319 | + print $globalCenterLatitude; |
|
| 320 | +} |
|
| 321 | +?>" /> |
|
| 259 | 322 | </p> |
| 260 | 323 | <p> |
| 261 | 324 | <label for="longitudecenter">The longitude center</label> |
| 262 | - <input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) print $globalCenterLongitude; ?>" /> |
|
| 325 | + <input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) { |
|
| 326 | + print $globalCenterLongitude; |
|
| 327 | +} |
|
| 328 | +?>" /> |
|
| 263 | 329 | </p> |
| 264 | 330 | <p> |
| 265 | 331 | <label for="livezoom">Default Zoom on live map</label> |
| 266 | - <input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>" /> |
|
| 332 | + <input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) { |
|
| 333 | + print $globalLiveZoom; |
|
| 334 | +} else { |
|
| 335 | + print '9'; |
|
| 336 | +} |
|
| 337 | +?>" /> |
|
| 267 | 338 | </p> |
| 268 | 339 | <p> |
| 269 | 340 | <label for="squawk_country">Country for squawk usage</label> |
| 270 | 341 | <select name="squawk_country" id="squawk_country"> |
| 271 | - <option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') print ' selected '; ?>>UK</option> |
|
| 272 | - <option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') print ' selected '; ?>>NZ</option> |
|
| 273 | - <option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') print ' selected '; ?>>US</option> |
|
| 274 | - <option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') print ' selected '; ?>>AU</option> |
|
| 275 | - <option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') print ' selected '; ?>>NL</option> |
|
| 276 | - <option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') print ' selected '; ?>>FR</option> |
|
| 277 | - <option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') print ' selected '; ?>>TR</option> |
|
| 342 | + <option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') { |
|
| 343 | + print ' selected '; |
|
| 344 | +} |
|
| 345 | +?>>UK</option> |
|
| 346 | + <option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') { |
|
| 347 | + print ' selected '; |
|
| 348 | +} |
|
| 349 | +?>>NZ</option> |
|
| 350 | + <option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') { |
|
| 351 | + print ' selected '; |
|
| 352 | +} |
|
| 353 | +?>>US</option> |
|
| 354 | + <option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') { |
|
| 355 | + print ' selected '; |
|
| 356 | +} |
|
| 357 | +?>>AU</option> |
|
| 358 | + <option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') { |
|
| 359 | + print ' selected '; |
|
| 360 | +} |
|
| 361 | +?>>NL</option> |
|
| 362 | + <option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') { |
|
| 363 | + print ' selected '; |
|
| 364 | +} |
|
| 365 | +?>>FR</option> |
|
| 366 | + <option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') { |
|
| 367 | + print ' selected '; |
|
| 368 | +} |
|
| 369 | +?>>TR</option> |
|
| 278 | 370 | </select> |
| 279 | 371 | </p> |
| 280 | 372 | </fieldset> |
@@ -283,15 +375,24 @@ discard block |
||
| 283 | 375 | <p><i>Only put in DB flights that are inside a circle</i></p> |
| 284 | 376 | <p> |
| 285 | 377 | <label for="latitude">Center latitude</label> |
| 286 | - <input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) echo $globalDistanceIgnore['latitude']; ?>" /> |
|
| 378 | + <input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) { |
|
| 379 | + echo $globalDistanceIgnore['latitude']; |
|
| 380 | +} |
|
| 381 | +?>" /> |
|
| 287 | 382 | </p> |
| 288 | 383 | <p> |
| 289 | 384 | <label for="longitude">Center longitude</label> |
| 290 | - <input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) echo $globalDistanceIgnore['longitude']; ?>" /> |
|
| 385 | + <input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) { |
|
| 386 | + echo $globalDistanceIgnore['longitude']; |
|
| 387 | +} |
|
| 388 | +?>" /> |
|
| 291 | 389 | </p> |
| 292 | 390 | <p> |
| 293 | 391 | <label for="Distance">Distance (in km)</label> |
| 294 | - <input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) echo $globalDistanceIgnore['distance']; ?>" /> |
|
| 392 | + <input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) { |
|
| 393 | + echo $globalDistanceIgnore['distance']; |
|
| 394 | +} |
|
| 395 | +?>" /> |
|
| 295 | 396 | </p> |
| 296 | 397 | </fieldset> |
| 297 | 398 | <fieldset id="sourceloc"> |
@@ -400,11 +501,17 @@ discard block |
||
| 400 | 501 | <div id="flightaware_data"> |
| 401 | 502 | <p> |
| 402 | 503 | <label for="flightawareusername">FlightAware username</label> |
| 403 | - <input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" /> |
|
| 504 | + <input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) { |
|
| 505 | + print $globalFlightAwareUsername; |
|
| 506 | +} |
|
| 507 | +?>" /> |
|
| 404 | 508 | </p> |
| 405 | 509 | <p> |
| 406 | 510 | <label for="flightawarepassword">FlightAware password/API key</label> |
| 407 | - <input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" /> |
|
| 511 | + <input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) { |
|
| 512 | + print $globalFlightAwarePassword; |
|
| 513 | +} |
|
| 514 | +?>" /> |
|
| 408 | 515 | </p> |
| 409 | 516 | </div> |
| 410 | 517 | --> |
@@ -464,29 +571,92 @@ discard block |
||
| 464 | 571 | ?> |
| 465 | 572 | <td> |
| 466 | 573 | <select name="format[]" id="format"> |
| 467 | - <option value="auto" <?php if (!isset($source['format'])) print 'selected'; ?>>Auto</option> |
|
| 468 | - <option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') print 'selected'; ?>>SBS</option> |
|
| 469 | - <option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') print 'selected'; ?>>TSV</option> |
|
| 470 | - <option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') print 'selected'; ?>>Raw</option> |
|
| 471 | - <option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') print 'selected'; ?>>APRS</option> |
|
| 472 | - <option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') print 'selected'; ?>>Radarcape deltadb.txt</option> |
|
| 473 | - <option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') print 'selected'; ?>>Vatsim</option> |
|
| 474 | - <option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') print 'selected'; ?>>Virtual Radar Server AircraftList.json</option> |
|
| 475 | - <option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') print 'selected'; ?>>Virtual Radar Server TCP</option> |
|
| 476 | - <option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option> |
|
| 477 | - <option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') print 'selected'; ?>>Virtual Airlines Manager</option> |
|
| 478 | - <option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') print 'selected'; ?>>IVAO</option> |
|
| 479 | - <option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') print 'selected'; ?>>FlightGear Multiplayer</option> |
|
| 480 | - <option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option> |
|
| 481 | - <option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option> |
|
| 482 | - <option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS SBS-3 over TCP</option> |
|
| 483 | - <option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') print 'selected'; ?>>NMEA AIS over TCP</option> |
|
| 484 | - <option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') print 'selected'; ?>>AirWhere website</option> |
|
| 574 | + <option value="auto" <?php if (!isset($source['format'])) { |
|
| 575 | + print 'selected'; |
|
| 576 | +} |
|
| 577 | +?>>Auto</option> |
|
| 578 | + <option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') { |
|
| 579 | + print 'selected'; |
|
| 580 | +} |
|
| 581 | +?>>SBS</option> |
|
| 582 | + <option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') { |
|
| 583 | + print 'selected'; |
|
| 584 | +} |
|
| 585 | +?>>TSV</option> |
|
| 586 | + <option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') { |
|
| 587 | + print 'selected'; |
|
| 588 | +} |
|
| 589 | +?>>Raw</option> |
|
| 590 | + <option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 591 | + print 'selected'; |
|
| 592 | +} |
|
| 593 | +?>>APRS</option> |
|
| 594 | + <option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') { |
|
| 595 | + print 'selected'; |
|
| 596 | +} |
|
| 597 | +?>>Radarcape deltadb.txt</option> |
|
| 598 | + <option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') { |
|
| 599 | + print 'selected'; |
|
| 600 | +} |
|
| 601 | +?>>Vatsim</option> |
|
| 602 | + <option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') { |
|
| 603 | + print 'selected'; |
|
| 604 | +} |
|
| 605 | +?>>Virtual Radar Server AircraftList.json</option> |
|
| 606 | + <option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') { |
|
| 607 | + print 'selected'; |
|
| 608 | +} |
|
| 609 | +?>>Virtual Radar Server TCP</option> |
|
| 610 | + <option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') { |
|
| 611 | + print 'selected'; |
|
| 612 | +} |
|
| 613 | +?>>phpVMS</option> |
|
| 614 | + <option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') { |
|
| 615 | + print 'selected'; |
|
| 616 | +} |
|
| 617 | +?>>Virtual Airlines Manager</option> |
|
| 618 | + <option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') { |
|
| 619 | + print 'selected'; |
|
| 620 | +} |
|
| 621 | +?>>IVAO</option> |
|
| 622 | + <option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') { |
|
| 623 | + print 'selected'; |
|
| 624 | +} |
|
| 625 | +?>>FlightGear Multiplayer</option> |
|
| 626 | + <option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') { |
|
| 627 | + print 'selected'; |
|
| 628 | +} |
|
| 629 | +?>>FlightGear Singleplayer</option> |
|
| 630 | + <option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') { |
|
| 631 | + print 'selected'; |
|
| 632 | +} |
|
| 633 | +?>>ACARS from acarsdec/acarsdeco2 over UDP</option> |
|
| 634 | + <option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') { |
|
| 635 | + print 'selected'; |
|
| 636 | +} |
|
| 637 | +?>>ACARS SBS-3 over TCP</option> |
|
| 638 | + <option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') { |
|
| 639 | + print 'selected'; |
|
| 640 | +} |
|
| 641 | +?>>NMEA AIS over TCP</option> |
|
| 642 | + <option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') { |
|
| 643 | + print 'selected'; |
|
| 644 | +} |
|
| 645 | +?>>AirWhere website</option> |
|
| 485 | 646 | </select> |
| 486 | 647 | </td> |
| 487 | - <td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" /></td> |
|
| 488 | - <td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) print 'checked'; ?> /></td> |
|
| 489 | - <td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) print 'checked'; ?> /></td> |
|
| 648 | + <td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) { |
|
| 649 | + print $source['name']; |
|
| 650 | +} |
|
| 651 | +?>" /></td> |
|
| 652 | + <td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) { |
|
| 653 | + print 'checked'; |
|
| 654 | +} |
|
| 655 | +?> /></td> |
|
| 656 | + <td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) { |
|
| 657 | + print 'checked'; |
|
| 658 | +} |
|
| 659 | +?> /></td> |
|
| 490 | 660 | <td><input type="button" id="delhost" value="Delete" onclick="deleteRow(this)" /> <input type="button" id="addhost" value="Add" onclick="insRow()" /></td> |
| 491 | 661 | </tr> |
| 492 | 662 | <?php |
@@ -536,11 +706,17 @@ discard block |
||
| 536 | 706 | <p>Listen UDP server for acarsdec/acarsdeco2/... with <i>daemon-acars.php</i> script</p> |
| 537 | 707 | <p> |
| 538 | 708 | <label for="acarshost">ACARS UDP host</label> |
| 539 | - <input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) print $globalACARSHost; ?>" /> |
|
| 709 | + <input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) { |
|
| 710 | + print $globalACARSHost; |
|
| 711 | +} |
|
| 712 | +?>" /> |
|
| 540 | 713 | </p> |
| 541 | 714 | <p> |
| 542 | 715 | <label for="acarsport">ACARS UDP port</label> |
| 543 | - <input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) print $globalACARSPort; ?>" /> |
|
| 716 | + <input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) { |
|
| 717 | + print $globalACARSPort; |
|
| 718 | +} |
|
| 719 | +?>" /> |
|
| 544 | 720 | </p> |
| 545 | 721 | </fieldset> |
| 546 | 722 | </div> |
@@ -620,13 +796,19 @@ discard block |
||
| 620 | 796 | <div id="schedules_options"> |
| 621 | 797 | <p> |
| 622 | 798 | <label for="britishairways">British Airways API Key</label> |
| 623 | - <input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) print $globalBritishAirwaysKey; ?>" /> |
|
| 799 | + <input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) { |
|
| 800 | + print $globalBritishAirwaysKey; |
|
| 801 | +} |
|
| 802 | +?>" /> |
|
| 624 | 803 | <p class="help-block">Register an account on <a href="https://developer.ba.com/">https://developer.ba.com/</a></p> |
| 625 | 804 | </p> |
| 626 | 805 | <!-- |
| 627 | 806 | <p> |
| 628 | 807 | <label for="transavia">Transavia Test API Consumer Key</label> |
| 629 | - <input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) print $globalTransaviaKey; ?>" /> |
|
| 808 | + <input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) { |
|
| 809 | + print $globalTransaviaKey; |
|
| 810 | +} |
|
| 811 | +?>" /> |
|
| 630 | 812 | <p class="help-block">Register an account on <a href="https://developer.transavia.com">https://developer.transavia.com</a></p> |
| 631 | 813 | </p> |
| 632 | 814 | --> |
@@ -635,10 +817,16 @@ discard block |
||
| 635 | 817 | <b>Lufthansa API Key</b> |
| 636 | 818 | <p> |
| 637 | 819 | <label for="lufthansakey">Key</label> |
| 638 | - <input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) print $globalLufthansaKey['key']; ?>" /> |
|
| 820 | + <input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) { |
|
| 821 | + print $globalLufthansaKey['key']; |
|
| 822 | +} |
|
| 823 | +?>" /> |
|
| 639 | 824 | </p><p> |
| 640 | 825 | <label for="lufthansasecret">Secret</label> |
| 641 | - <input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) print $globalLufthansaKey['secret']; ?>" /> |
|
| 826 | + <input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) { |
|
| 827 | + print $globalLufthansaKey['secret']; |
|
| 828 | +} |
|
| 829 | +?>" /> |
|
| 642 | 830 | </p> |
| 643 | 831 | </div> |
| 644 | 832 | <p class="help-block">Register an account on <a href="https://developer.lufthansa.com/page">https://developer.lufthansa.com/page</a></p> |
@@ -658,7 +846,10 @@ discard block |
||
| 658 | 846 | </p> |
| 659 | 847 | <p> |
| 660 | 848 | <label for="notamsource">URL of your feed from notaminfo.com</label> |
| 661 | - <input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) print $globalNOTAMSource; ?>" /> |
|
| 849 | + <input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) { |
|
| 850 | + print $globalNOTAMSource; |
|
| 851 | +} |
|
| 852 | +?>" /> |
|
| 662 | 853 | <p class="help-block">If you want to use world NOTAM from FlightAirMap website, leave it blank</p> |
| 663 | 854 | </p> |
| 664 | 855 | <br /> |
@@ -674,14 +865,20 @@ discard block |
||
| 674 | 865 | <div id="metarsrc"> |
| 675 | 866 | <p> |
| 676 | 867 | <label for="metarsource">URL of your METAR source</label> |
| 677 | - <input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) print $globalMETARurl; ?>" /> |
|
| 868 | + <input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) { |
|
| 869 | + print $globalMETARurl; |
|
| 870 | +} |
|
| 871 | +?>" /> |
|
| 678 | 872 | <p class="help-block">Use {icao} to specify where we replace by airport icao. ex : http://metar.vatsim.net/metar.php?id={icao}</p> |
| 679 | 873 | </p> |
| 680 | 874 | </div> |
| 681 | 875 | <br /> |
| 682 | 876 | <p> |
| 683 | 877 | <label for="bitly">Bit.ly access token api (used in search page)</label> |
| 684 | - <input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) print $globalBitlyAccessToken; ?>" /> |
|
| 878 | + <input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) { |
|
| 879 | + print $globalBitlyAccessToken; |
|
| 880 | +} |
|
| 881 | +?>" /> |
|
| 685 | 882 | </p> |
| 686 | 883 | <br /> |
| 687 | 884 | <p> |
@@ -701,7 +898,12 @@ discard block |
||
| 701 | 898 | </p> |
| 702 | 899 | <p> |
| 703 | 900 | <label for="archivemonths">Generate statistics, delete or put in archive flights older than xx months</label> |
| 704 | - <input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) print $globalArchiveMonths; else echo '0'; ?>" /> |
|
| 901 | + <input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) { |
|
| 902 | + print $globalArchiveMonths; |
|
| 903 | +} else { |
|
| 904 | + echo '0'; |
|
| 905 | +} |
|
| 906 | +?>" /> |
|
| 705 | 907 | <p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p> |
| 706 | 908 | </p> |
| 707 | 909 | <p> |
@@ -711,12 +913,22 @@ discard block |
||
| 711 | 913 | </p> |
| 712 | 914 | <p> |
| 713 | 915 | <label for="archivekeepmonths">Keep flights data for xx months in archive</label> |
| 714 | - <input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) print $globalArchiveKeepMonths; else echo '0'; ?>" /> |
|
| 916 | + <input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) { |
|
| 917 | + print $globalArchiveKeepMonths; |
|
| 918 | +} else { |
|
| 919 | + echo '0'; |
|
| 920 | +} |
|
| 921 | +?>" /> |
|
| 715 | 922 | <p class="help-block">0 to disable</p> |
| 716 | 923 | </p> |
| 717 | 924 | <p> |
| 718 | 925 | <label for="archivekeeptrackmonths">Keep flights track data for xx months in archive</label> |
| 719 | - <input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) print $globalArchiveKeepTrackMonths; else echo '0'; ?>" /> |
|
| 926 | + <input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) { |
|
| 927 | + print $globalArchiveKeepTrackMonths; |
|
| 928 | +} else { |
|
| 929 | + echo '0'; |
|
| 930 | +} |
|
| 931 | +?>" /> |
|
| 720 | 932 | <p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p> |
| 721 | 933 | </p> |
| 722 | 934 | <br /> |
@@ -726,7 +938,12 @@ discard block |
||
| 726 | 938 | <p class="help-block">Uncheck if the script is running as cron job</p> |
| 727 | 939 | <div id="cronends"> |
| 728 | 940 | <label for="cronend">Run script for xx seconds</label> |
| 729 | - <input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) print $globalCronEnd; else print '0'; ?>" /> |
|
| 941 | + <input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) { |
|
| 942 | + print $globalCronEnd; |
|
| 943 | +} else { |
|
| 944 | + print '0'; |
|
| 945 | +} |
|
| 946 | +?>" /> |
|
| 730 | 947 | <p class="help-block">Set to 0 to disable. Should be disabled if source is URL.</p> |
| 731 | 948 | </div> |
| 732 | 949 | </p> |
@@ -779,15 +996,30 @@ discard block |
||
| 779 | 996 | <br /> |
| 780 | 997 | <p> |
| 781 | 998 | <label for="refresh">Show flights detected since xxx seconds</label> |
| 782 | - <input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) echo $globalLiveInterval; else echo '200'; ?>" /> |
|
| 999 | + <input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) { |
|
| 1000 | + echo $globalLiveInterval; |
|
| 1001 | +} else { |
|
| 1002 | + echo '200'; |
|
| 1003 | +} |
|
| 1004 | +?>" /> |
|
| 783 | 1005 | </p> |
| 784 | 1006 | <p> |
| 785 | 1007 | <label for="maprefresh">Live map refresh (in seconds)</label> |
| 786 | - <input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) echo $globalMapRefresh; else echo '30'; ?>" /> |
|
| 1008 | + <input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) { |
|
| 1009 | + echo $globalMapRefresh; |
|
| 1010 | +} else { |
|
| 1011 | + echo '30'; |
|
| 1012 | +} |
|
| 1013 | +?>" /> |
|
| 787 | 1014 | </p> |
| 788 | 1015 | <p> |
| 789 | 1016 | <label for="mapidle">Map idle timeout (in minutes)</label> |
| 790 | - <input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) echo $globalMapIdleTimeout; else echo '30'; ?>" /> |
|
| 1017 | + <input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) { |
|
| 1018 | + echo $globalMapIdleTimeout; |
|
| 1019 | +} else { |
|
| 1020 | + echo '30'; |
|
| 1021 | +} |
|
| 1022 | +?>" /> |
|
| 791 | 1023 | <p class="help-block">0 to disable</p> |
| 792 | 1024 | </p> |
| 793 | 1025 | <p> |
@@ -797,12 +1029,20 @@ discard block |
||
| 797 | 1029 | <br /> |
| 798 | 1030 | <p> |
| 799 | 1031 | <label for="closestmindist">Distance to airport set as arrival (in km)</label> |
| 800 | - <input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) echo $globalClosestMinDist; else echo '50'; ?>" /> |
|
| 1032 | + <input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) { |
|
| 1033 | + echo $globalClosestMinDist; |
|
| 1034 | +} else { |
|
| 1035 | + echo '50'; |
|
| 1036 | +} |
|
| 1037 | +?>" /> |
|
| 801 | 1038 | </p> |
| 802 | 1039 | <br /> |
| 803 | 1040 | <p> |
| 804 | 1041 | <label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
| 805 | - <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
| 1042 | + <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) { |
|
| 1043 | + echo $globalAircraftSize; |
|
| 1044 | +} |
|
| 1045 | +?>" /> |
|
| 806 | 1046 | </p> |
| 807 | 1047 | <br /> |
| 808 | 1048 | <p> |
@@ -815,7 +1055,12 @@ discard block |
||
| 815 | 1055 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 816 | 1056 | ?> |
| 817 | 1057 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
| 818 | - <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
|
| 1058 | + <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) { |
|
| 1059 | + echo $globalAircraftIconColor; |
|
| 1060 | +} else { |
|
| 1061 | + echo '1a3151'; |
|
| 1062 | +} |
|
| 1063 | +?>" /> |
|
| 819 | 1064 | <?php |
| 820 | 1065 | if (!is_writable('../cache')) { |
| 821 | 1066 | ?> |
@@ -833,14 +1078,27 @@ discard block |
||
| 833 | 1078 | <p> |
| 834 | 1079 | <label for="airportzoom">Zoom level minimum to see airports icons</label> |
| 835 | 1080 | <div class="range"> |
| 836 | - <input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?>" /> |
|
| 837 | - <output id="range"><?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?></output> |
|
| 1081 | + <input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) { |
|
| 1082 | + echo $globalAirportZoom; |
|
| 1083 | +} else { |
|
| 1084 | + echo '7'; |
|
| 1085 | +} |
|
| 1086 | +?>" /> |
|
| 1087 | + <output id="range"><?php if (isset($globalAirportZoom)) { |
|
| 1088 | + echo $globalAirportZoom; |
|
| 1089 | +} else { |
|
| 1090 | + echo '7'; |
|
| 1091 | +} |
|
| 1092 | +?></output> |
|
| 838 | 1093 | </div> |
| 839 | 1094 | </p> |
| 840 | 1095 | <br /> |
| 841 | 1096 | <p> |
| 842 | 1097 | <label for="customcss">Custom CSS web path</label> |
| 843 | - <input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) echo $globalCustomCSS; ?>" /> |
|
| 1098 | + <input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) { |
|
| 1099 | + echo $globalCustomCSS; |
|
| 1100 | +} |
|
| 1101 | +?>" /> |
|
| 844 | 1102 | </p> |
| 845 | 1103 | </fieldset> |
| 846 | 1104 | <input type="submit" name="submit" value="Create/Update database & write setup" /> |
@@ -867,8 +1125,12 @@ discard block |
||
| 867 | 1125 | $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
| 868 | 1126 | $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
| 869 | 1127 | |
| 870 | - if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
|
| 871 | - if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
|
| 1128 | + if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) { |
|
| 1129 | + $error .= 'Mysql driver for PDO must be loaded'; |
|
| 1130 | + } |
|
| 1131 | + if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) { |
|
| 1132 | + $error .= 'PosgreSQL driver for PDO must be loaded'; |
|
| 1133 | + } |
|
| 872 | 1134 | |
| 873 | 1135 | $_SESSION['database_root'] = $dbroot; |
| 874 | 1136 | $_SESSION['database_rootpass'] = $dbrootpass; |
@@ -935,15 +1197,23 @@ discard block |
||
| 935 | 1197 | $source_city = $_POST['source_city']; |
| 936 | 1198 | $source_country = $_POST['source_country']; |
| 937 | 1199 | $source_ref = $_POST['source_ref']; |
| 938 | - if (isset($source_id)) $source_id = $_POST['source_id']; |
|
| 939 | - else $source_id = array(); |
|
| 1200 | + if (isset($source_id)) { |
|
| 1201 | + $source_id = $_POST['source_id']; |
|
| 1202 | + } else { |
|
| 1203 | + $source_id = array(); |
|
| 1204 | + } |
|
| 940 | 1205 | |
| 941 | 1206 | $sources = array(); |
| 942 | 1207 | foreach ($source_name as $keys => $name) { |
| 943 | - if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]); |
|
| 944 | - else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]); |
|
| 1208 | + if (isset($source_id[$keys])) { |
|
| 1209 | + $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]); |
|
| 1210 | + } else { |
|
| 1211 | + $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]); |
|
| 1212 | + } |
|
| 1213 | + } |
|
| 1214 | + if (count($sources) > 0) { |
|
| 1215 | + $_SESSION['sources'] = $sources; |
|
| 945 | 1216 | } |
| 946 | - if (count($sources) > 0) $_SESSION['sources'] = $sources; |
|
| 947 | 1217 | |
| 948 | 1218 | //$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING); |
| 949 | 1219 | //$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT); |
@@ -964,14 +1234,23 @@ discard block |
||
| 964 | 1234 | $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
| 965 | 1235 | |
| 966 | 1236 | $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
| 967 | - if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 968 | - else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 1237 | + if ($globalaircraft == 'aircraft') { |
|
| 1238 | + $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 1239 | + } else { |
|
| 1240 | + $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 1241 | + } |
|
| 969 | 1242 | $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
| 970 | - if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 971 | - else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 1243 | + if ($globaltracker == 'tracker') { |
|
| 1244 | + $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 1245 | + } else { |
|
| 1246 | + $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 1247 | + } |
|
| 972 | 1248 | $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
| 973 | - if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 974 | - else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 1249 | + if ($globalmarine == 'marine') { |
|
| 1250 | + $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 1251 | + } else { |
|
| 1252 | + $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 1253 | + } |
|
| 975 | 1254 | |
| 976 | 1255 | /* |
| 977 | 1256 | $globalSBS1Hosts = array(); |
@@ -992,19 +1271,35 @@ discard block |
||
| 992 | 1271 | $port = $_POST['port']; |
| 993 | 1272 | $name = $_POST['name']; |
| 994 | 1273 | $format = $_POST['format']; |
| 995 | - if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats']; |
|
| 996 | - else $sourcestats = array(); |
|
| 997 | - if (isset($_POST['noarchive'])) $noarchive = $_POST['noarchive']; |
|
| 998 | - else $noarchive = array(); |
|
| 1274 | + if (isset($_POST['sourcestats'])) { |
|
| 1275 | + $sourcestats = $_POST['sourcestats']; |
|
| 1276 | + } else { |
|
| 1277 | + $sourcestats = array(); |
|
| 1278 | + } |
|
| 1279 | + if (isset($_POST['noarchive'])) { |
|
| 1280 | + $noarchive = $_POST['noarchive']; |
|
| 1281 | + } else { |
|
| 1282 | + $noarchive = array(); |
|
| 1283 | + } |
|
| 999 | 1284 | $gSources = array(); |
| 1000 | 1285 | $forcepilots = false; |
| 1001 | 1286 | foreach ($host as $key => $h) { |
| 1002 | - if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE'; |
|
| 1003 | - else $cov = 'FALSE'; |
|
| 1004 | - if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
|
| 1005 | - else $arch = 'FALSE'; |
|
| 1006 | - if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch); |
|
| 1007 | - if ($format[$key] == 'airwhere') $forcepilots = true; |
|
| 1287 | + if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) { |
|
| 1288 | + $cov = 'TRUE'; |
|
| 1289 | + } else { |
|
| 1290 | + $cov = 'FALSE'; |
|
| 1291 | + } |
|
| 1292 | + if (isset($noarchive[$key]) && $noarchive[$key] == 1) { |
|
| 1293 | + $arch = 'TRUE'; |
|
| 1294 | + } else { |
|
| 1295 | + $arch = 'FALSE'; |
|
| 1296 | + } |
|
| 1297 | + if ($h != '') { |
|
| 1298 | + $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch); |
|
| 1299 | + } |
|
| 1300 | + if ($format[$key] == 'airwhere') { |
|
| 1301 | + $forcepilots = true; |
|
| 1302 | + } |
|
| 1008 | 1303 | } |
| 1009 | 1304 | $settings = array_merge($settings,array('globalSources' => $gSources)); |
| 1010 | 1305 | |
@@ -1032,7 +1327,9 @@ discard block |
||
| 1032 | 1327 | $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
| 1033 | 1328 | if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
| 1034 | 1329 | $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
| 1035 | - } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1330 | + } else { |
|
| 1331 | + $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1332 | + } |
|
| 1036 | 1333 | |
| 1037 | 1334 | $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
| 1038 | 1335 | $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
@@ -1071,7 +1368,9 @@ discard block |
||
| 1071 | 1368 | |
| 1072 | 1369 | // Create in settings.php keys not yet configurable if not already here |
| 1073 | 1370 | //if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
| 1074 | - if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1371 | + if (!isset($globalDebug)) { |
|
| 1372 | + $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1373 | + } |
|
| 1075 | 1374 | |
| 1076 | 1375 | $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
| 1077 | 1376 | if ($resetyearstats == 'resetyearstats') { |
@@ -1108,37 +1407,56 @@ discard block |
||
| 1108 | 1407 | } |
| 1109 | 1408 | */ |
| 1110 | 1409 | $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
| 1111 | - if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1112 | - else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1113 | - if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1114 | - else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1410 | + if ($globalsbs == 'sbs') { |
|
| 1411 | + $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1412 | + } else { |
|
| 1413 | + $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1414 | + } |
|
| 1415 | + if ($globalaprs == 'aprs') { |
|
| 1416 | + $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1417 | + } else { |
|
| 1418 | + $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1419 | + } |
|
| 1115 | 1420 | $va = false; |
| 1116 | 1421 | if ($globalivao == 'ivao') { |
| 1117 | 1422 | $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
| 1118 | 1423 | $va = true; |
| 1119 | - } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1424 | + } else { |
|
| 1425 | + $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1426 | + } |
|
| 1120 | 1427 | if ($globalvatsim == 'vatsim') { |
| 1121 | 1428 | $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
| 1122 | 1429 | $va = true; |
| 1123 | - } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1430 | + } else { |
|
| 1431 | + $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1432 | + } |
|
| 1124 | 1433 | if ($globalphpvms == 'phpvms') { |
| 1125 | 1434 | $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
| 1126 | 1435 | $va = true; |
| 1127 | - } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1436 | + } else { |
|
| 1437 | + $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1438 | + } |
|
| 1128 | 1439 | if ($globalvam == 'vam') { |
| 1129 | 1440 | $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
| 1130 | 1441 | $va = true; |
| 1131 | - } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1442 | + } else { |
|
| 1443 | + $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1444 | + } |
|
| 1132 | 1445 | if ($va) { |
| 1133 | 1446 | $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
| 1134 | - } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1447 | + } else { |
|
| 1448 | + $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1449 | + } |
|
| 1135 | 1450 | if ($globalva == 'va' || $va) { |
| 1136 | 1451 | $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
| 1137 | 1452 | $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
| 1138 | 1453 | } else { |
| 1139 | 1454 | $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
| 1140 | - if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
| 1141 | - else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE')); |
|
| 1455 | + if ($forcepilots) { |
|
| 1456 | + $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
| 1457 | + } else { |
|
| 1458 | + $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE')); |
|
| 1459 | + } |
|
| 1142 | 1460 | } |
| 1143 | 1461 | |
| 1144 | 1462 | |
@@ -1299,7 +1617,9 @@ discard block |
||
| 1299 | 1617 | $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
| 1300 | 1618 | } |
| 1301 | 1619 | |
| 1302 | - if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1620 | + if (!isset($globalTransaction)) { |
|
| 1621 | + $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1622 | + } |
|
| 1303 | 1623 | |
| 1304 | 1624 | // Set some defaults values... |
| 1305 | 1625 | if (!isset($globalAircraftImageSources)) { |
@@ -1314,15 +1634,23 @@ discard block |
||
| 1314 | 1634 | |
| 1315 | 1635 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
| 1316 | 1636 | |
| 1317 | - if ($error == '') settings::modify_settings($settings); |
|
| 1318 | - if ($error == '') settings::comment_settings($settings_comment); |
|
| 1637 | + if ($error == '') { |
|
| 1638 | + settings::modify_settings($settings); |
|
| 1639 | + } |
|
| 1640 | + if ($error == '') { |
|
| 1641 | + settings::comment_settings($settings_comment); |
|
| 1642 | + } |
|
| 1319 | 1643 | if ($error != '') { |
| 1320 | 1644 | print '<div class="info column">'.$error.'</div>'; |
| 1321 | 1645 | require('../footer.php'); |
| 1322 | 1646 | exit; |
| 1323 | 1647 | } else { |
| 1324 | - if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') $_SESSION['waypoints'] = 1; |
|
| 1325 | - if (isset($_POST['owner']) && $_POST['owner'] == 'owner') $_SESSION['owner'] = 1; |
|
| 1648 | + if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') { |
|
| 1649 | + $_SESSION['waypoints'] = 1; |
|
| 1650 | + } |
|
| 1651 | + if (isset($_POST['owner']) && $_POST['owner'] == 'owner') { |
|
| 1652 | + $_SESSION['owner'] = 1; |
|
| 1653 | + } |
|
| 1326 | 1654 | if (isset($_POST['createdb'])) { |
| 1327 | 1655 | $_SESSION['install'] = 'database_create'; |
| 1328 | 1656 | } else { |
@@ -1363,10 +1691,18 @@ discard block |
||
| 1363 | 1691 | $popw = false; |
| 1364 | 1692 | foreach ($_SESSION['done'] as $done) { |
| 1365 | 1693 | print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
| 1366 | - if ($done == 'Create database') $pop = true; |
|
| 1367 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1368 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1369 | - if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1694 | + if ($done == 'Create database') { |
|
| 1695 | + $pop = true; |
|
| 1696 | + } |
|
| 1697 | + if ($_SESSION['install'] == 'database_create') { |
|
| 1698 | + $pop = true; |
|
| 1699 | + } |
|
| 1700 | + if ($_SESSION['install'] == 'database_import') { |
|
| 1701 | + $popi = true; |
|
| 1702 | + } |
|
| 1703 | + if ($_SESSION['install'] == 'waypoints') { |
|
| 1704 | + $popw = true; |
|
| 1705 | + } |
|
| 1370 | 1706 | } |
| 1371 | 1707 | if ($pop) { |
| 1372 | 1708 | sleep(5); |
@@ -1377,7 +1713,9 @@ discard block |
||
| 1377 | 1713 | } else if ($popw) { |
| 1378 | 1714 | sleep(5); |
| 1379 | 1715 | print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
| 1380 | - } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
|
| 1716 | + } else { |
|
| 1717 | + print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
|
| 1718 | + } |
|
| 1381 | 1719 | print '</div></ul>'; |
| 1382 | 1720 | print '<div id="error"></div>'; |
| 1383 | 1721 | /* foreach ($_SESSION['done'] as $done) { |
@@ -8,12 +8,12 @@ discard block |
||
| 8 | 8 | $this->db = $Connection->db; |
| 9 | 9 | } |
| 10 | 10 | |
| 11 | - /** |
|
| 12 | - * Get SQL query part for filter used |
|
| 13 | - * @param Array $filter the filter |
|
| 14 | - * @return Array the SQL part |
|
| 15 | - */ |
|
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 11 | + /** |
|
| 12 | + * Get SQL query part for filter used |
|
| 13 | + * @param Array $filter the filter |
|
| 14 | + * @return Array the SQL part |
|
| 15 | + */ |
|
| 16 | + public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
@@ -30,88 +30,88 @@ discard block |
||
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | 32 | foreach($filters as $flt) { |
| 33 | - if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 33 | + if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 34 | 34 | if ($flt['airlines'][0] != '') { |
| 35 | - if (isset($flt['source'])) { |
|
| 35 | + if (isset($flt['source'])) { |
|
| 36 | 36 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
| 37 | - } else { |
|
| 37 | + } else { |
|
| 38 | 38 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
| 39 | - } |
|
| 39 | + } |
|
| 40 | + } |
|
| 40 | 41 | } |
| 41 | - } |
|
| 42 | - if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 42 | + if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 43 | 43 | if (isset($flt['source'])) { |
| 44 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 44 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | 45 | } else { |
| 46 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | 47 | } |
| 48 | - } |
|
| 49 | - if (isset($flt['idents']) && !empty($flt['idents'])) { |
|
| 48 | + } |
|
| 49 | + if (isset($flt['idents']) && !empty($flt['idents'])) { |
|
| 50 | 50 | if (isset($flt['source'])) { |
| 51 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 51 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | 52 | } else { |
| 53 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | - } |
|
| 56 | - if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
|
| 56 | + if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
|
| 57 | 57 | if (isset($flt['source'])) { |
| 58 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 58 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | 59 | } else { |
| 60 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | + } |
|
| 61 | 62 | } |
| 62 | - } |
|
| 63 | - if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
|
| 63 | + if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
|
| 64 | 64 | if (isset($flt['source'])) { |
| 65 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 65 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | + } |
|
| 66 | 67 | } |
| 67 | - } |
|
| 68 | 68 | } |
| 69 | 69 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 70 | - if ($filter['airlines'][0] != '') { |
|
| 70 | + if ($filter['airlines'][0] != '') { |
|
| 71 | 71 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
| 72 | - } |
|
| 72 | + } |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 76 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
|
| 76 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
|
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 82 | + $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 85 | - $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
|
| 85 | + $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
|
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 88 | 88 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 89 | 89 | } |
| 90 | 90 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 91 | - $filter_query_date = ''; |
|
| 91 | + $filter_query_date = ''; |
|
| 92 | 92 | |
| 93 | - if (isset($filter['year']) && $filter['year'] != '') { |
|
| 93 | + if (isset($filter['year']) && $filter['year'] != '') { |
|
| 94 | 94 | if ($globalDBdriver == 'mysql') { |
| 95 | - $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 95 | + $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 96 | 96 | } else { |
| 97 | - $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 97 | + $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 98 | + } |
|
| 98 | 99 | } |
| 99 | - } |
|
| 100 | - if (isset($filter['month']) && $filter['month'] != '') { |
|
| 100 | + if (isset($filter['month']) && $filter['month'] != '') { |
|
| 101 | 101 | if ($globalDBdriver == 'mysql') { |
| 102 | - $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 102 | + $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 103 | 103 | } else { |
| 104 | - $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 104 | + $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 105 | 105 | } |
| 106 | - } |
|
| 107 | - if (isset($filter['day']) && $filter['day'] != '') { |
|
| 106 | + } |
|
| 107 | + if (isset($filter['day']) && $filter['day'] != '') { |
|
| 108 | 108 | if ($globalDBdriver == 'mysql') { |
| 109 | - $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 109 | + $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 110 | 110 | } else { |
| 111 | - $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 111 | + $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 112 | + } |
|
| 112 | 113 | } |
| 113 | - } |
|
| 114 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 114 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 115 | 115 | } |
| 116 | 116 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 117 | 117 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | $filter_query = $filter_query_join.$filter_query_where; |
| 122 | 122 | return $filter_query; |
| 123 | - } |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | 125 | // Spotter_archive |
| 126 | 126 | public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
@@ -152,44 +152,44 @@ discard block |
||
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | |
| 155 | - /** |
|
| 156 | - * Gets all the spotter information based on a particular callsign |
|
| 157 | - * |
|
| 158 | - * @return Array the spotter information |
|
| 159 | - * |
|
| 160 | - */ |
|
| 161 | - public function getLastArchiveSpotterDataByIdent($ident) |
|
| 162 | - { |
|
| 155 | + /** |
|
| 156 | + * Gets all the spotter information based on a particular callsign |
|
| 157 | + * |
|
| 158 | + * @return Array the spotter information |
|
| 159 | + * |
|
| 160 | + */ |
|
| 161 | + public function getLastArchiveSpotterDataByIdent($ident) |
|
| 162 | + { |
|
| 163 | 163 | $Spotter = new Spotter($this->db); |
| 164 | - date_default_timezone_set('UTC'); |
|
| 164 | + date_default_timezone_set('UTC'); |
|
| 165 | 165 | |
| 166 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 167 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 168 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 166 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 167 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 168 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 169 | 169 | |
| 170 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 171 | 171 | |
| 172 | - return $spotter_array; |
|
| 173 | - } |
|
| 172 | + return $spotter_array; |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | 175 | |
| 176 | - /** |
|
| 177 | - * Gets last the spotter information based on a particular id |
|
| 178 | - * |
|
| 179 | - * @return Array the spotter information |
|
| 180 | - * |
|
| 181 | - */ |
|
| 182 | - public function getLastArchiveSpotterDataById($id) |
|
| 183 | - { |
|
| 184 | - $Spotter = new Spotter($this->db); |
|
| 185 | - date_default_timezone_set('UTC'); |
|
| 186 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 187 | - //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 188 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 189 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 176 | + /** |
|
| 177 | + * Gets last the spotter information based on a particular id |
|
| 178 | + * |
|
| 179 | + * @return Array the spotter information |
|
| 180 | + * |
|
| 181 | + */ |
|
| 182 | + public function getLastArchiveSpotterDataById($id) |
|
| 183 | + { |
|
| 184 | + $Spotter = new Spotter($this->db); |
|
| 185 | + date_default_timezone_set('UTC'); |
|
| 186 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 187 | + //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 188 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 189 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 190 | 190 | |
| 191 | 191 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 192 | - /* |
|
| 192 | + /* |
|
| 193 | 193 | try { |
| 194 | 194 | $Connection = new Connection(); |
| 195 | 195 | $sth = Connection->$db->prepare($query); |
@@ -199,232 +199,232 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 201 | 201 | */ |
| 202 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 203 | - |
|
| 204 | - return $spotter_array; |
|
| 205 | - } |
|
| 206 | - |
|
| 207 | - /** |
|
| 208 | - * Gets all the spotter information based on a particular id |
|
| 209 | - * |
|
| 210 | - * @return Array the spotter information |
|
| 211 | - * |
|
| 212 | - */ |
|
| 213 | - public function getAllArchiveSpotterDataById($id) |
|
| 202 | + $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 203 | + |
|
| 204 | + return $spotter_array; |
|
| 205 | + } |
|
| 206 | + |
|
| 207 | + /** |
|
| 208 | + * Gets all the spotter information based on a particular id |
|
| 209 | + * |
|
| 210 | + * @return Array the spotter information |
|
| 211 | + * |
|
| 212 | + */ |
|
| 213 | + public function getAllArchiveSpotterDataById($id) |
|
| 214 | 214 | { |
| 215 | - date_default_timezone_set('UTC'); |
|
| 216 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 217 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 215 | + date_default_timezone_set('UTC'); |
|
| 216 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 217 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 218 | 218 | |
| 219 | 219 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 220 | 220 | |
| 221 | - try { |
|
| 222 | - $sth = $this->db->prepare($query); |
|
| 223 | - $sth->execute(array(':id' => $id)); |
|
| 224 | - } catch(PDOException $e) { |
|
| 225 | - echo $e->getMessage(); |
|
| 226 | - die; |
|
| 227 | - } |
|
| 228 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 229 | - |
|
| 230 | - return $spotter_array; |
|
| 231 | - } |
|
| 232 | - |
|
| 233 | - /** |
|
| 234 | - * Gets coordinate & time spotter information based on a particular id |
|
| 235 | - * |
|
| 236 | - * @return Array the spotter information |
|
| 237 | - * |
|
| 238 | - */ |
|
| 239 | - public function getCoordArchiveSpotterDataById($id) |
|
| 240 | - { |
|
| 241 | - date_default_timezone_set('UTC'); |
|
| 242 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 243 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 221 | + try { |
|
| 222 | + $sth = $this->db->prepare($query); |
|
| 223 | + $sth->execute(array(':id' => $id)); |
|
| 224 | + } catch(PDOException $e) { |
|
| 225 | + echo $e->getMessage(); |
|
| 226 | + die; |
|
| 227 | + } |
|
| 228 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 229 | + |
|
| 230 | + return $spotter_array; |
|
| 231 | + } |
|
| 232 | + |
|
| 233 | + /** |
|
| 234 | + * Gets coordinate & time spotter information based on a particular id |
|
| 235 | + * |
|
| 236 | + * @return Array the spotter information |
|
| 237 | + * |
|
| 238 | + */ |
|
| 239 | + public function getCoordArchiveSpotterDataById($id) |
|
| 240 | + { |
|
| 241 | + date_default_timezone_set('UTC'); |
|
| 242 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 243 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 244 | 244 | |
| 245 | 245 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 246 | 246 | |
| 247 | - try { |
|
| 248 | - $sth = $this->db->prepare($query); |
|
| 249 | - $sth->execute(array(':id' => $id)); |
|
| 250 | - } catch(PDOException $e) { |
|
| 251 | - echo $e->getMessage(); |
|
| 252 | - die; |
|
| 253 | - } |
|
| 254 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 247 | + try { |
|
| 248 | + $sth = $this->db->prepare($query); |
|
| 249 | + $sth->execute(array(':id' => $id)); |
|
| 250 | + } catch(PDOException $e) { |
|
| 251 | + echo $e->getMessage(); |
|
| 252 | + die; |
|
| 253 | + } |
|
| 254 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 255 | 255 | |
| 256 | - return $spotter_array; |
|
| 257 | - } |
|
| 256 | + return $spotter_array; |
|
| 257 | + } |
|
| 258 | 258 | |
| 259 | 259 | |
| 260 | - /** |
|
| 261 | - * Gets altitude information based on a particular callsign |
|
| 262 | - * |
|
| 263 | - * @return Array the spotter information |
|
| 264 | - * |
|
| 265 | - */ |
|
| 266 | - public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 267 | - { |
|
| 260 | + /** |
|
| 261 | + * Gets altitude information based on a particular callsign |
|
| 262 | + * |
|
| 263 | + * @return Array the spotter information |
|
| 264 | + * |
|
| 265 | + */ |
|
| 266 | + public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 267 | + { |
|
| 268 | 268 | |
| 269 | - date_default_timezone_set('UTC'); |
|
| 269 | + date_default_timezone_set('UTC'); |
|
| 270 | 270 | |
| 271 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 272 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 271 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 272 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 273 | 273 | |
| 274 | - try { |
|
| 275 | - $sth = $this->db->prepare($query); |
|
| 276 | - $sth->execute(array(':ident' => $ident)); |
|
| 277 | - } catch(PDOException $e) { |
|
| 278 | - echo $e->getMessage(); |
|
| 279 | - die; |
|
| 280 | - } |
|
| 281 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 274 | + try { |
|
| 275 | + $sth = $this->db->prepare($query); |
|
| 276 | + $sth->execute(array(':ident' => $ident)); |
|
| 277 | + } catch(PDOException $e) { |
|
| 278 | + echo $e->getMessage(); |
|
| 279 | + die; |
|
| 280 | + } |
|
| 281 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 282 | 282 | |
| 283 | - return $spotter_array; |
|
| 284 | - } |
|
| 283 | + return $spotter_array; |
|
| 284 | + } |
|
| 285 | 285 | |
| 286 | - /** |
|
| 287 | - * Gets altitude information based on a particular id |
|
| 288 | - * |
|
| 289 | - * @return Array the spotter information |
|
| 290 | - * |
|
| 291 | - */ |
|
| 292 | - public function getAltitudeArchiveSpotterDataById($id) |
|
| 293 | - { |
|
| 286 | + /** |
|
| 287 | + * Gets altitude information based on a particular id |
|
| 288 | + * |
|
| 289 | + * @return Array the spotter information |
|
| 290 | + * |
|
| 291 | + */ |
|
| 292 | + public function getAltitudeArchiveSpotterDataById($id) |
|
| 293 | + { |
|
| 294 | 294 | |
| 295 | - date_default_timezone_set('UTC'); |
|
| 295 | + date_default_timezone_set('UTC'); |
|
| 296 | 296 | |
| 297 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 298 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 297 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 298 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 299 | 299 | |
| 300 | - try { |
|
| 301 | - $sth = $this->db->prepare($query); |
|
| 302 | - $sth->execute(array(':id' => $id)); |
|
| 303 | - } catch(PDOException $e) { |
|
| 304 | - echo $e->getMessage(); |
|
| 305 | - die; |
|
| 306 | - } |
|
| 307 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 300 | + try { |
|
| 301 | + $sth = $this->db->prepare($query); |
|
| 302 | + $sth->execute(array(':id' => $id)); |
|
| 303 | + } catch(PDOException $e) { |
|
| 304 | + echo $e->getMessage(); |
|
| 305 | + die; |
|
| 306 | + } |
|
| 307 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 308 | 308 | |
| 309 | - return $spotter_array; |
|
| 310 | - } |
|
| 309 | + return $spotter_array; |
|
| 310 | + } |
|
| 311 | 311 | |
| 312 | - /** |
|
| 313 | - * Gets altitude & speed information based on a particular id |
|
| 314 | - * |
|
| 315 | - * @return Array the spotter information |
|
| 316 | - * |
|
| 317 | - */ |
|
| 318 | - public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 319 | - { |
|
| 312 | + /** |
|
| 313 | + * Gets altitude & speed information based on a particular id |
|
| 314 | + * |
|
| 315 | + * @return Array the spotter information |
|
| 316 | + * |
|
| 317 | + */ |
|
| 318 | + public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 319 | + { |
|
| 320 | 320 | |
| 321 | - date_default_timezone_set('UTC'); |
|
| 321 | + date_default_timezone_set('UTC'); |
|
| 322 | 322 | |
| 323 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 324 | - $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 323 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 324 | + $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 325 | 325 | |
| 326 | - try { |
|
| 327 | - $sth = $this->db->prepare($query); |
|
| 328 | - $sth->execute(array(':id' => $id)); |
|
| 329 | - } catch(PDOException $e) { |
|
| 330 | - echo $e->getMessage(); |
|
| 331 | - die; |
|
| 332 | - } |
|
| 333 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 326 | + try { |
|
| 327 | + $sth = $this->db->prepare($query); |
|
| 328 | + $sth->execute(array(':id' => $id)); |
|
| 329 | + } catch(PDOException $e) { |
|
| 330 | + echo $e->getMessage(); |
|
| 331 | + die; |
|
| 332 | + } |
|
| 333 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 334 | 334 | |
| 335 | - return $spotter_array; |
|
| 336 | - } |
|
| 335 | + return $spotter_array; |
|
| 336 | + } |
|
| 337 | 337 | |
| 338 | 338 | |
| 339 | - /** |
|
| 340 | - * Gets altitude information based on a particular callsign |
|
| 341 | - * |
|
| 342 | - * @return Array the spotter information |
|
| 343 | - * |
|
| 344 | - */ |
|
| 345 | - public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 346 | - { |
|
| 339 | + /** |
|
| 340 | + * Gets altitude information based on a particular callsign |
|
| 341 | + * |
|
| 342 | + * @return Array the spotter information |
|
| 343 | + * |
|
| 344 | + */ |
|
| 345 | + public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 346 | + { |
|
| 347 | 347 | |
| 348 | - date_default_timezone_set('UTC'); |
|
| 348 | + date_default_timezone_set('UTC'); |
|
| 349 | 349 | |
| 350 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 351 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 350 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 351 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 352 | 352 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 353 | 353 | |
| 354 | - try { |
|
| 355 | - $sth = $this->db->prepare($query); |
|
| 356 | - $sth->execute(array(':ident' => $ident)); |
|
| 357 | - } catch(PDOException $e) { |
|
| 358 | - echo $e->getMessage(); |
|
| 359 | - die; |
|
| 360 | - } |
|
| 361 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 354 | + try { |
|
| 355 | + $sth = $this->db->prepare($query); |
|
| 356 | + $sth->execute(array(':ident' => $ident)); |
|
| 357 | + } catch(PDOException $e) { |
|
| 358 | + echo $e->getMessage(); |
|
| 359 | + die; |
|
| 360 | + } |
|
| 361 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 362 | 362 | |
| 363 | - return $spotter_array; |
|
| 364 | - } |
|
| 363 | + return $spotter_array; |
|
| 364 | + } |
|
| 365 | 365 | |
| 366 | 366 | |
| 367 | 367 | |
| 368 | - /** |
|
| 369 | - * Gets all the archive spotter information |
|
| 370 | - * |
|
| 371 | - * @return Array the spotter information |
|
| 372 | - * |
|
| 373 | - */ |
|
| 374 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 375 | - { |
|
| 376 | - $Spotter = new Spotter($this->db); |
|
| 377 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 378 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 368 | + /** |
|
| 369 | + * Gets all the archive spotter information |
|
| 370 | + * |
|
| 371 | + * @return Array the spotter information |
|
| 372 | + * |
|
| 373 | + */ |
|
| 374 | + public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 375 | + { |
|
| 376 | + $Spotter = new Spotter($this->db); |
|
| 377 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 378 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 379 | 379 | |
| 380 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 380 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 381 | 381 | |
| 382 | - return $spotter_array; |
|
| 383 | - } |
|
| 382 | + return $spotter_array; |
|
| 383 | + } |
|
| 384 | 384 | |
| 385 | - public function deleteSpotterArchiveTrackData() |
|
| 386 | - { |
|
| 385 | + public function deleteSpotterArchiveTrackData() |
|
| 386 | + { |
|
| 387 | 387 | global $globalArchiveKeepTrackMonths; |
| 388 | - date_default_timezone_set('UTC'); |
|
| 388 | + date_default_timezone_set('UTC'); |
|
| 389 | 389 | $query = 'DELETE FROM spotter_archive WHERE spotter_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
| 390 | - try { |
|
| 391 | - $sth = $this->db->prepare($query); |
|
| 392 | - $sth->execute(); |
|
| 393 | - } catch(PDOException $e) { |
|
| 394 | - echo $e->getMessage(); |
|
| 395 | - die; |
|
| 396 | - } |
|
| 390 | + try { |
|
| 391 | + $sth = $this->db->prepare($query); |
|
| 392 | + $sth->execute(); |
|
| 393 | + } catch(PDOException $e) { |
|
| 394 | + echo $e->getMessage(); |
|
| 395 | + die; |
|
| 396 | + } |
|
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | - * Gets Minimal Live Spotter data |
|
| 401 | - * |
|
| 402 | - * @return Array the spotter information |
|
| 403 | - * |
|
| 404 | - */ |
|
| 405 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 406 | - { |
|
| 407 | - global $globalDBdriver, $globalLiveInterval; |
|
| 408 | - date_default_timezone_set('UTC'); |
|
| 409 | - |
|
| 410 | - $filter_query = ''; |
|
| 411 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 412 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 413 | - } |
|
| 414 | - // Use spotter_output also ? |
|
| 415 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 416 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 417 | - } |
|
| 418 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 419 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 420 | - } |
|
| 421 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 422 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 423 | - } |
|
| 424 | - |
|
| 425 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 426 | - if ($globalDBdriver == 'mysql') { |
|
| 427 | - /* |
|
| 400 | + * Gets Minimal Live Spotter data |
|
| 401 | + * |
|
| 402 | + * @return Array the spotter information |
|
| 403 | + * |
|
| 404 | + */ |
|
| 405 | + public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 406 | + { |
|
| 407 | + global $globalDBdriver, $globalLiveInterval; |
|
| 408 | + date_default_timezone_set('UTC'); |
|
| 409 | + |
|
| 410 | + $filter_query = ''; |
|
| 411 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 412 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 413 | + } |
|
| 414 | + // Use spotter_output also ? |
|
| 415 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 416 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 417 | + } |
|
| 418 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 419 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 420 | + } |
|
| 421 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 422 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 423 | + } |
|
| 424 | + |
|
| 425 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 426 | + if ($globalDBdriver == 'mysql') { |
|
| 427 | + /* |
|
| 428 | 428 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 429 | 429 | FROM spotter_archive |
| 430 | 430 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -443,56 +443,56 @@ discard block |
||
| 443 | 443 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 444 | 444 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 445 | 445 | '.$filter_query.' ORDER BY flightaware_id'; |
| 446 | - } else { |
|
| 447 | - //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 448 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 446 | + } else { |
|
| 447 | + //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 448 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 449 | 449 | FROM spotter_archive |
| 450 | 450 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 451 | 451 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
| 452 | 452 | '.$filter_query.' ORDER BY flightaware_id'; |
| 453 | - } |
|
| 454 | - //echo $query; |
|
| 455 | - try { |
|
| 456 | - $sth = $this->db->prepare($query); |
|
| 457 | - $sth->execute(); |
|
| 458 | - } catch(PDOException $e) { |
|
| 459 | - echo $e->getMessage(); |
|
| 460 | - die; |
|
| 461 | - } |
|
| 462 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 463 | - |
|
| 464 | - return $spotter_array; |
|
| 465 | - } |
|
| 453 | + } |
|
| 454 | + //echo $query; |
|
| 455 | + try { |
|
| 456 | + $sth = $this->db->prepare($query); |
|
| 457 | + $sth->execute(); |
|
| 458 | + } catch(PDOException $e) { |
|
| 459 | + echo $e->getMessage(); |
|
| 460 | + die; |
|
| 461 | + } |
|
| 462 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 463 | + |
|
| 464 | + return $spotter_array; |
|
| 465 | + } |
|
| 466 | 466 | |
| 467 | 467 | /** |
| 468 | - * Gets Minimal Live Spotter data |
|
| 469 | - * |
|
| 470 | - * @return Array the spotter information |
|
| 471 | - * |
|
| 472 | - */ |
|
| 473 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 474 | - { |
|
| 475 | - global $globalDBdriver, $globalLiveInterval; |
|
| 476 | - date_default_timezone_set('UTC'); |
|
| 477 | - |
|
| 478 | - $filter_query = ''; |
|
| 479 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 480 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 481 | - } |
|
| 482 | - // Should use spotter_output also ? |
|
| 483 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 484 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 485 | - } |
|
| 486 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 487 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 488 | - } |
|
| 489 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 490 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 491 | - } |
|
| 492 | - |
|
| 493 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 494 | - if ($globalDBdriver == 'mysql') { |
|
| 495 | - /* |
|
| 468 | + * Gets Minimal Live Spotter data |
|
| 469 | + * |
|
| 470 | + * @return Array the spotter information |
|
| 471 | + * |
|
| 472 | + */ |
|
| 473 | + public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 474 | + { |
|
| 475 | + global $globalDBdriver, $globalLiveInterval; |
|
| 476 | + date_default_timezone_set('UTC'); |
|
| 477 | + |
|
| 478 | + $filter_query = ''; |
|
| 479 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 480 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 481 | + } |
|
| 482 | + // Should use spotter_output also ? |
|
| 483 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 484 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 485 | + } |
|
| 486 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 487 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 488 | + } |
|
| 489 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 490 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 491 | + } |
|
| 492 | + |
|
| 493 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 494 | + if ($globalDBdriver == 'mysql') { |
|
| 495 | + /* |
|
| 496 | 496 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 497 | 497 | FROM spotter_archive |
| 498 | 498 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -503,95 +503,95 @@ discard block |
||
| 503 | 503 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 504 | 504 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 505 | 505 | |
| 506 | - } else { |
|
| 507 | - //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 508 | - /* |
|
| 506 | + } else { |
|
| 507 | + //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 508 | + /* |
|
| 509 | 509 | $query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
| 510 | 510 | FROM spotter_archive_output |
| 511 | 511 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 512 | 512 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 513 | 513 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 514 | 514 | */ |
| 515 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 515 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 516 | 516 | FROM spotter_archive_output |
| 517 | 517 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 518 | 518 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 519 | 519 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 520 | 520 | // .' GROUP BY spotter_output.flightaware_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow'; |
| 521 | 521 | |
| 522 | - } |
|
| 523 | - //echo $query; |
|
| 524 | - try { |
|
| 525 | - $sth = $this->db->prepare($query); |
|
| 526 | - $sth->execute(); |
|
| 527 | - } catch(PDOException $e) { |
|
| 528 | - echo $e->getMessage(); |
|
| 529 | - die; |
|
| 530 | - } |
|
| 531 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 532 | - |
|
| 533 | - return $spotter_array; |
|
| 534 | - } |
|
| 522 | + } |
|
| 523 | + //echo $query; |
|
| 524 | + try { |
|
| 525 | + $sth = $this->db->prepare($query); |
|
| 526 | + $sth->execute(); |
|
| 527 | + } catch(PDOException $e) { |
|
| 528 | + echo $e->getMessage(); |
|
| 529 | + die; |
|
| 530 | + } |
|
| 531 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 532 | + |
|
| 533 | + return $spotter_array; |
|
| 534 | + } |
|
| 535 | 535 | |
| 536 | 536 | /** |
| 537 | - * Gets count Live Spotter data |
|
| 538 | - * |
|
| 539 | - * @return Array the spotter information |
|
| 540 | - * |
|
| 541 | - */ |
|
| 542 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 543 | - { |
|
| 544 | - global $globalDBdriver, $globalLiveInterval; |
|
| 545 | - date_default_timezone_set('UTC'); |
|
| 546 | - |
|
| 547 | - $filter_query = ''; |
|
| 548 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 549 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 550 | - } |
|
| 551 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 552 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 553 | - } |
|
| 554 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 555 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 556 | - } |
|
| 557 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 558 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 559 | - } |
|
| 560 | - |
|
| 561 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 562 | - if ($globalDBdriver == 'mysql') { |
|
| 537 | + * Gets count Live Spotter data |
|
| 538 | + * |
|
| 539 | + * @return Array the spotter information |
|
| 540 | + * |
|
| 541 | + */ |
|
| 542 | + public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 543 | + { |
|
| 544 | + global $globalDBdriver, $globalLiveInterval; |
|
| 545 | + date_default_timezone_set('UTC'); |
|
| 546 | + |
|
| 547 | + $filter_query = ''; |
|
| 548 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 549 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 550 | + } |
|
| 551 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 552 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 553 | + } |
|
| 554 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 555 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 556 | + } |
|
| 557 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 558 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 559 | + } |
|
| 560 | + |
|
| 561 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 562 | + if ($globalDBdriver == 'mysql') { |
|
| 563 | 563 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb |
| 564 | 564 | FROM spotter_archive l |
| 565 | 565 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 566 | - } else { |
|
| 566 | + } else { |
|
| 567 | 567 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 568 | - } |
|
| 569 | - //echo $query; |
|
| 570 | - try { |
|
| 571 | - $sth = $this->db->prepare($query); |
|
| 572 | - $sth->execute(); |
|
| 573 | - } catch(PDOException $e) { |
|
| 574 | - echo $e->getMessage(); |
|
| 575 | - die; |
|
| 576 | - } |
|
| 568 | + } |
|
| 569 | + //echo $query; |
|
| 570 | + try { |
|
| 571 | + $sth = $this->db->prepare($query); |
|
| 572 | + $sth->execute(); |
|
| 573 | + } catch(PDOException $e) { |
|
| 574 | + echo $e->getMessage(); |
|
| 575 | + die; |
|
| 576 | + } |
|
| 577 | 577 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 578 | 578 | $sth->closeCursor(); |
| 579 | - return $result['nb']; |
|
| 579 | + return $result['nb']; |
|
| 580 | 580 | |
| 581 | - } |
|
| 581 | + } |
|
| 582 | 582 | |
| 583 | 583 | |
| 584 | 584 | |
| 585 | 585 | // Spotter_Archive_output |
| 586 | 586 | |
| 587 | - /** |
|
| 588 | - * Gets all the spotter information |
|
| 589 | - * |
|
| 590 | - * @return Array the spotter information |
|
| 591 | - * |
|
| 592 | - */ |
|
| 593 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 594 | - { |
|
| 587 | + /** |
|
| 588 | + * Gets all the spotter information |
|
| 589 | + * |
|
| 590 | + * @return Array the spotter information |
|
| 591 | + * |
|
| 592 | + */ |
|
| 593 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 594 | + { |
|
| 595 | 595 | global $globalTimezone, $globalDBdriver; |
| 596 | 596 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 597 | 597 | $Translation = new Translation(); |
@@ -605,159 +605,159 @@ discard block |
||
| 605 | 605 | $filter_query = $this->getFilter($filters); |
| 606 | 606 | if ($q != "") |
| 607 | 607 | { |
| 608 | - if (!is_string($q)) |
|
| 609 | - { |
|
| 608 | + if (!is_string($q)) |
|
| 609 | + { |
|
| 610 | 610 | return false; |
| 611 | - } else { |
|
| 611 | + } else { |
|
| 612 | 612 | |
| 613 | 613 | $q_array = explode(" ", $q); |
| 614 | 614 | |
| 615 | 615 | foreach ($q_array as $q_item){ |
| 616 | - $additional_query .= " AND ("; |
|
| 617 | - $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 618 | - $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 619 | - $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 620 | - $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 621 | - $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 622 | - $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 623 | - $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 624 | - $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 625 | - $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 626 | - $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 627 | - $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 628 | - $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 629 | - $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 630 | - $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 631 | - $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 632 | - $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 633 | - $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 634 | - $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 635 | - $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 636 | - $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 637 | - $translate = $Translation->ident2icao($q_item); |
|
| 638 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 639 | - $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 640 | - $additional_query .= ")"; |
|
| 641 | - } |
|
| 642 | - } |
|
| 616 | + $additional_query .= " AND ("; |
|
| 617 | + $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 618 | + $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 619 | + $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 620 | + $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 621 | + $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 622 | + $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 623 | + $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 624 | + $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 625 | + $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 626 | + $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 627 | + $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 628 | + $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 629 | + $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 630 | + $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 631 | + $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 632 | + $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 633 | + $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 634 | + $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 635 | + $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 636 | + $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 637 | + $translate = $Translation->ident2icao($q_item); |
|
| 638 | + if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 639 | + $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 640 | + $additional_query .= ")"; |
|
| 641 | + } |
|
| 642 | + } |
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | if ($registration != "") |
| 646 | 646 | { |
| 647 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 648 | - if (!is_string($registration)) |
|
| 649 | - { |
|
| 647 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 648 | + if (!is_string($registration)) |
|
| 649 | + { |
|
| 650 | 650 | return false; |
| 651 | - } else { |
|
| 651 | + } else { |
|
| 652 | 652 | $additional_query .= " AND (spotter_archive_output.registration = '".$registration."')"; |
| 653 | - } |
|
| 653 | + } |
|
| 654 | 654 | } |
| 655 | 655 | |
| 656 | 656 | if ($aircraft_icao != "") |
| 657 | 657 | { |
| 658 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 659 | - if (!is_string($aircraft_icao)) |
|
| 660 | - { |
|
| 658 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 659 | + if (!is_string($aircraft_icao)) |
|
| 660 | + { |
|
| 661 | 661 | return false; |
| 662 | - } else { |
|
| 662 | + } else { |
|
| 663 | 663 | $additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 664 | - } |
|
| 664 | + } |
|
| 665 | 665 | } |
| 666 | 666 | |
| 667 | 667 | if ($aircraft_manufacturer != "") |
| 668 | 668 | { |
| 669 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 670 | - if (!is_string($aircraft_manufacturer)) |
|
| 671 | - { |
|
| 669 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 670 | + if (!is_string($aircraft_manufacturer)) |
|
| 671 | + { |
|
| 672 | 672 | return false; |
| 673 | - } else { |
|
| 673 | + } else { |
|
| 674 | 674 | $additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 675 | - } |
|
| 675 | + } |
|
| 676 | 676 | } |
| 677 | 677 | |
| 678 | 678 | if ($highlights == "true") |
| 679 | 679 | { |
| 680 | - if (!is_string($highlights)) |
|
| 681 | - { |
|
| 680 | + if (!is_string($highlights)) |
|
| 681 | + { |
|
| 682 | 682 | return false; |
| 683 | - } else { |
|
| 683 | + } else { |
|
| 684 | 684 | $additional_query .= " AND (spotter_archive_output.highlight <> '')"; |
| 685 | - } |
|
| 685 | + } |
|
| 686 | 686 | } |
| 687 | 687 | |
| 688 | 688 | if ($airline_icao != "") |
| 689 | 689 | { |
| 690 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 691 | - if (!is_string($airline_icao)) |
|
| 692 | - { |
|
| 690 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 691 | + if (!is_string($airline_icao)) |
|
| 692 | + { |
|
| 693 | 693 | return false; |
| 694 | - } else { |
|
| 694 | + } else { |
|
| 695 | 695 | $additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')"; |
| 696 | - } |
|
| 696 | + } |
|
| 697 | 697 | } |
| 698 | 698 | |
| 699 | 699 | if ($airline_country != "") |
| 700 | 700 | { |
| 701 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 702 | - if (!is_string($airline_country)) |
|
| 703 | - { |
|
| 701 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 702 | + if (!is_string($airline_country)) |
|
| 703 | + { |
|
| 704 | 704 | return false; |
| 705 | - } else { |
|
| 705 | + } else { |
|
| 706 | 706 | $additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')"; |
| 707 | - } |
|
| 707 | + } |
|
| 708 | 708 | } |
| 709 | 709 | |
| 710 | 710 | if ($airline_type != "") |
| 711 | 711 | { |
| 712 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 713 | - if (!is_string($airline_type)) |
|
| 714 | - { |
|
| 712 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 713 | + if (!is_string($airline_type)) |
|
| 714 | + { |
|
| 715 | 715 | return false; |
| 716 | - } else { |
|
| 716 | + } else { |
|
| 717 | 717 | if ($airline_type == "passenger") |
| 718 | 718 | { |
| 719 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 719 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 720 | 720 | } |
| 721 | 721 | if ($airline_type == "cargo") |
| 722 | 722 | { |
| 723 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 723 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 724 | 724 | } |
| 725 | 725 | if ($airline_type == "military") |
| 726 | 726 | { |
| 727 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 727 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 728 | + } |
|
| 728 | 729 | } |
| 729 | - } |
|
| 730 | 730 | } |
| 731 | 731 | |
| 732 | 732 | if ($airport != "") |
| 733 | 733 | { |
| 734 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 735 | - if (!is_string($airport)) |
|
| 736 | - { |
|
| 734 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 735 | + if (!is_string($airport)) |
|
| 736 | + { |
|
| 737 | 737 | return false; |
| 738 | - } else { |
|
| 738 | + } else { |
|
| 739 | 739 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 740 | - } |
|
| 740 | + } |
|
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | if ($airport_country != "") |
| 744 | 744 | { |
| 745 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 746 | - if (!is_string($airport_country)) |
|
| 747 | - { |
|
| 745 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 746 | + if (!is_string($airport_country)) |
|
| 747 | + { |
|
| 748 | 748 | return false; |
| 749 | - } else { |
|
| 749 | + } else { |
|
| 750 | 750 | $additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 751 | - } |
|
| 751 | + } |
|
| 752 | 752 | } |
| 753 | 753 | |
| 754 | 754 | if ($callsign != "") |
| 755 | 755 | { |
| 756 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 757 | - if (!is_string($callsign)) |
|
| 758 | - { |
|
| 756 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 757 | + if (!is_string($callsign)) |
|
| 758 | + { |
|
| 759 | 759 | return false; |
| 760 | - } else { |
|
| 760 | + } else { |
|
| 761 | 761 | $translate = $Translation->ident2icao($callsign); |
| 762 | 762 | if ($translate != $callsign) { |
| 763 | 763 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
@@ -765,99 +765,99 @@ discard block |
||
| 765 | 765 | } else { |
| 766 | 766 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 767 | 767 | } |
| 768 | - } |
|
| 768 | + } |
|
| 769 | 769 | } |
| 770 | 770 | |
| 771 | 771 | if ($owner != "") |
| 772 | 772 | { |
| 773 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 774 | - if (!is_string($owner)) |
|
| 775 | - { |
|
| 773 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 774 | + if (!is_string($owner)) |
|
| 775 | + { |
|
| 776 | 776 | return false; |
| 777 | - } else { |
|
| 777 | + } else { |
|
| 778 | 778 | $additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')"; |
| 779 | - } |
|
| 779 | + } |
|
| 780 | 780 | } |
| 781 | 781 | |
| 782 | 782 | if ($pilot_name != "") |
| 783 | 783 | { |
| 784 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 785 | - if (!is_string($pilot_name)) |
|
| 786 | - { |
|
| 784 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 785 | + if (!is_string($pilot_name)) |
|
| 786 | + { |
|
| 787 | 787 | return false; |
| 788 | - } else { |
|
| 788 | + } else { |
|
| 789 | 789 | $additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')"; |
| 790 | - } |
|
| 790 | + } |
|
| 791 | 791 | } |
| 792 | 792 | |
| 793 | 793 | if ($pilot_id != "") |
| 794 | 794 | { |
| 795 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 796 | - if (!is_string($pilot_id)) |
|
| 797 | - { |
|
| 795 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 796 | + if (!is_string($pilot_id)) |
|
| 797 | + { |
|
| 798 | 798 | return false; |
| 799 | - } else { |
|
| 799 | + } else { |
|
| 800 | 800 | $additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')"; |
| 801 | - } |
|
| 801 | + } |
|
| 802 | 802 | } |
| 803 | 803 | |
| 804 | 804 | if ($departure_airport_route != "") |
| 805 | 805 | { |
| 806 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 807 | - if (!is_string($departure_airport_route)) |
|
| 808 | - { |
|
| 806 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 807 | + if (!is_string($departure_airport_route)) |
|
| 808 | + { |
|
| 809 | 809 | return false; |
| 810 | - } else { |
|
| 810 | + } else { |
|
| 811 | 811 | $additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 812 | - } |
|
| 812 | + } |
|
| 813 | 813 | } |
| 814 | 814 | |
| 815 | 815 | if ($arrival_airport_route != "") |
| 816 | 816 | { |
| 817 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 818 | - if (!is_string($arrival_airport_route)) |
|
| 819 | - { |
|
| 817 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 818 | + if (!is_string($arrival_airport_route)) |
|
| 819 | + { |
|
| 820 | 820 | return false; |
| 821 | - } else { |
|
| 821 | + } else { |
|
| 822 | 822 | $additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 823 | - } |
|
| 823 | + } |
|
| 824 | 824 | } |
| 825 | 825 | |
| 826 | 826 | if ($altitude != "") |
| 827 | 827 | { |
| 828 | - $altitude_array = explode(",", $altitude); |
|
| 828 | + $altitude_array = explode(",", $altitude); |
|
| 829 | 829 | |
| 830 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 832 | 832 | |
| 833 | 833 | |
| 834 | - if ($altitude_array[1] != "") |
|
| 835 | - { |
|
| 834 | + if ($altitude_array[1] != "") |
|
| 835 | + { |
|
| 836 | 836 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 837 | 837 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 838 | 838 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 839 | - } else { |
|
| 839 | + } else { |
|
| 840 | 840 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 841 | 841 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 842 | - } |
|
| 842 | + } |
|
| 843 | 843 | } |
| 844 | 844 | |
| 845 | 845 | if ($date_posted != "") |
| 846 | 846 | { |
| 847 | - $date_array = explode(",", $date_posted); |
|
| 847 | + $date_array = explode(",", $date_posted); |
|
| 848 | 848 | |
| 849 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 850 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 849 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 850 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 851 | 851 | |
| 852 | - if ($globalTimezone != '') { |
|
| 852 | + if ($globalTimezone != '') { |
|
| 853 | 853 | date_default_timezone_set($globalTimezone); |
| 854 | 854 | $datetime = new DateTime(); |
| 855 | 855 | $offset = $datetime->format('P'); |
| 856 | - } else $offset = '+00:00'; |
|
| 856 | + } else $offset = '+00:00'; |
|
| 857 | 857 | |
| 858 | 858 | |
| 859 | - if ($date_array[1] != "") |
|
| 860 | - { |
|
| 859 | + if ($date_array[1] != "") |
|
| 860 | + { |
|
| 861 | 861 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 862 | 862 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
| 863 | 863 | if ($globalDBdriver == 'mysql') { |
@@ -865,28 +865,28 @@ discard block |
||
| 865 | 865 | } else { |
| 866 | 866 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
| 867 | 867 | } |
| 868 | - } else { |
|
| 868 | + } else { |
|
| 869 | 869 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 870 | - if ($globalDBdriver == 'mysql') { |
|
| 870 | + if ($globalDBdriver == 'mysql') { |
|
| 871 | 871 | $additional_query .= " AND TIMESTAMP(CONVERT_TZ(spotter_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
| 872 | 872 | } else { |
| 873 | 873 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
| 874 | 874 | } |
| 875 | - } |
|
| 875 | + } |
|
| 876 | 876 | } |
| 877 | 877 | |
| 878 | 878 | if ($limit != "") |
| 879 | 879 | { |
| 880 | - $limit_array = explode(",", $limit); |
|
| 880 | + $limit_array = explode(",", $limit); |
|
| 881 | 881 | |
| 882 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 884 | 884 | |
| 885 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 886 | - { |
|
| 885 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 886 | + { |
|
| 887 | 887 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 888 | 888 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 889 | - } |
|
| 889 | + } |
|
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | |
@@ -917,33 +917,33 @@ discard block |
||
| 917 | 917 | $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
| 918 | 918 | |
| 919 | 919 | return $spotter_array; |
| 920 | - } |
|
| 920 | + } |
|
| 921 | 921 | |
| 922 | - public function deleteSpotterArchiveData() |
|
| 923 | - { |
|
| 922 | + public function deleteSpotterArchiveData() |
|
| 923 | + { |
|
| 924 | 924 | global $globalArchiveKeepMonths, $globalDBdriver; |
| 925 | - date_default_timezone_set('UTC'); |
|
| 926 | - if ($globalDBdriver == 'mysql') { |
|
| 925 | + date_default_timezone_set('UTC'); |
|
| 926 | + if ($globalDBdriver == 'mysql') { |
|
| 927 | 927 | $query = 'DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
| 928 | 928 | } else { |
| 929 | 929 | $query = "DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
| 930 | 930 | } |
| 931 | - try { |
|
| 932 | - $sth = $this->db->prepare($query); |
|
| 933 | - $sth->execute(); |
|
| 934 | - } catch(PDOException $e) { |
|
| 935 | - return "error"; |
|
| 936 | - } |
|
| 931 | + try { |
|
| 932 | + $sth = $this->db->prepare($query); |
|
| 933 | + $sth->execute(); |
|
| 934 | + } catch(PDOException $e) { |
|
| 935 | + return "error"; |
|
| 936 | + } |
|
| 937 | 937 | } |
| 938 | 938 | |
| 939 | - /** |
|
| 940 | - * Gets all the spotter information based on the callsign |
|
| 941 | - * |
|
| 942 | - * @return Array the spotter information |
|
| 943 | - * |
|
| 944 | - */ |
|
| 945 | - public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 946 | - { |
|
| 939 | + /** |
|
| 940 | + * Gets all the spotter information based on the callsign |
|
| 941 | + * |
|
| 942 | + * @return Array the spotter information |
|
| 943 | + * |
|
| 944 | + */ |
|
| 945 | + public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 946 | + { |
|
| 947 | 947 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 948 | 948 | |
| 949 | 949 | date_default_timezone_set('UTC'); |
@@ -955,35 +955,35 @@ discard block |
||
| 955 | 955 | |
| 956 | 956 | if ($ident != "") |
| 957 | 957 | { |
| 958 | - if (!is_string($ident)) |
|
| 959 | - { |
|
| 958 | + if (!is_string($ident)) |
|
| 959 | + { |
|
| 960 | 960 | return false; |
| 961 | - } else { |
|
| 961 | + } else { |
|
| 962 | 962 | $additional_query = " AND (spotter_archive_output.ident = :ident)"; |
| 963 | 963 | $query_values = array(':ident' => $ident); |
| 964 | - } |
|
| 964 | + } |
|
| 965 | 965 | } |
| 966 | 966 | |
| 967 | 967 | if ($limit != "") |
| 968 | 968 | { |
| 969 | - $limit_array = explode(",", $limit); |
|
| 969 | + $limit_array = explode(",", $limit); |
|
| 970 | 970 | |
| 971 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 973 | 973 | |
| 974 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 975 | - { |
|
| 974 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 975 | + { |
|
| 976 | 976 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 977 | 977 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 978 | - } |
|
| 978 | + } |
|
| 979 | 979 | } |
| 980 | 980 | |
| 981 | 981 | if ($sort != "") |
| 982 | 982 | { |
| 983 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 984 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 983 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 984 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 985 | 985 | } else { |
| 986 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 986 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 987 | 987 | } |
| 988 | 988 | |
| 989 | 989 | $query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -991,17 +991,17 @@ discard block |
||
| 991 | 991 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 992 | 992 | |
| 993 | 993 | return $spotter_array; |
| 994 | - } |
|
| 994 | + } |
|
| 995 | 995 | |
| 996 | 996 | |
| 997 | - /** |
|
| 998 | - * Gets all the spotter information based on the owner |
|
| 999 | - * |
|
| 1000 | - * @return Array the spotter information |
|
| 1001 | - * |
|
| 1002 | - */ |
|
| 1003 | - public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1004 | - { |
|
| 997 | + /** |
|
| 998 | + * Gets all the spotter information based on the owner |
|
| 999 | + * |
|
| 1000 | + * @return Array the spotter information |
|
| 1001 | + * |
|
| 1002 | + */ |
|
| 1003 | + public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1004 | + { |
|
| 1005 | 1005 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1006 | 1006 | |
| 1007 | 1007 | date_default_timezone_set('UTC'); |
@@ -1014,35 +1014,35 @@ discard block |
||
| 1014 | 1014 | |
| 1015 | 1015 | if ($owner != "") |
| 1016 | 1016 | { |
| 1017 | - if (!is_string($owner)) |
|
| 1018 | - { |
|
| 1017 | + if (!is_string($owner)) |
|
| 1018 | + { |
|
| 1019 | 1019 | return false; |
| 1020 | - } else { |
|
| 1020 | + } else { |
|
| 1021 | 1021 | $additional_query = " AND (spotter_archive_output.owner_name = :owner)"; |
| 1022 | 1022 | $query_values = array(':owner' => $owner); |
| 1023 | - } |
|
| 1023 | + } |
|
| 1024 | 1024 | } |
| 1025 | 1025 | |
| 1026 | 1026 | if ($limit != "") |
| 1027 | 1027 | { |
| 1028 | - $limit_array = explode(",", $limit); |
|
| 1028 | + $limit_array = explode(",", $limit); |
|
| 1029 | 1029 | |
| 1030 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1032 | 1032 | |
| 1033 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1034 | - { |
|
| 1033 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1034 | + { |
|
| 1035 | 1035 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1036 | 1036 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1037 | - } |
|
| 1037 | + } |
|
| 1038 | 1038 | } |
| 1039 | 1039 | |
| 1040 | 1040 | if ($sort != "") |
| 1041 | 1041 | { |
| 1042 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1043 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1042 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1043 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1044 | 1044 | } else { |
| 1045 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1045 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1046 | 1046 | } |
| 1047 | 1047 | |
| 1048 | 1048 | $query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1050,16 +1050,16 @@ discard block |
||
| 1050 | 1050 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1051 | 1051 | |
| 1052 | 1052 | return $spotter_array; |
| 1053 | - } |
|
| 1054 | - |
|
| 1055 | - /** |
|
| 1056 | - * Gets all the spotter information based on the pilot |
|
| 1057 | - * |
|
| 1058 | - * @return Array the spotter information |
|
| 1059 | - * |
|
| 1060 | - */ |
|
| 1061 | - public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1062 | - { |
|
| 1053 | + } |
|
| 1054 | + |
|
| 1055 | + /** |
|
| 1056 | + * Gets all the spotter information based on the pilot |
|
| 1057 | + * |
|
| 1058 | + * @return Array the spotter information |
|
| 1059 | + * |
|
| 1060 | + */ |
|
| 1061 | + public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1062 | + { |
|
| 1063 | 1063 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1064 | 1064 | |
| 1065 | 1065 | date_default_timezone_set('UTC'); |
@@ -1078,24 +1078,24 @@ discard block |
||
| 1078 | 1078 | |
| 1079 | 1079 | if ($limit != "") |
| 1080 | 1080 | { |
| 1081 | - $limit_array = explode(",", $limit); |
|
| 1081 | + $limit_array = explode(",", $limit); |
|
| 1082 | 1082 | |
| 1083 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1085 | 1085 | |
| 1086 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1087 | - { |
|
| 1086 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1087 | + { |
|
| 1088 | 1088 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1089 | 1089 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1090 | - } |
|
| 1090 | + } |
|
| 1091 | 1091 | } |
| 1092 | 1092 | |
| 1093 | 1093 | if ($sort != "") |
| 1094 | 1094 | { |
| 1095 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1096 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1095 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1096 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1097 | 1097 | } else { |
| 1098 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1098 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1099 | 1099 | } |
| 1100 | 1100 | |
| 1101 | 1101 | $query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1103,16 +1103,16 @@ discard block |
||
| 1103 | 1103 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1104 | 1104 | |
| 1105 | 1105 | return $spotter_array; |
| 1106 | - } |
|
| 1107 | - |
|
| 1108 | - /** |
|
| 1109 | - * Gets all number of flight over countries |
|
| 1110 | - * |
|
| 1111 | - * @return Array the airline country list |
|
| 1112 | - * |
|
| 1113 | - */ |
|
| 1114 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1115 | - { |
|
| 1106 | + } |
|
| 1107 | + |
|
| 1108 | + /** |
|
| 1109 | + * Gets all number of flight over countries |
|
| 1110 | + * |
|
| 1111 | + * @return Array the airline country list |
|
| 1112 | + * |
|
| 1113 | + */ |
|
| 1114 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1115 | + { |
|
| 1116 | 1116 | global $globalDBdriver; |
| 1117 | 1117 | /* |
| 1118 | 1118 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1122,14 +1122,14 @@ discard block |
||
| 1122 | 1122 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1123 | 1123 | FROM countries c, spotter_archive s |
| 1124 | 1124 | WHERE c.iso2 = s.over_country "; |
| 1125 | - if ($olderthanmonths > 0) { |
|
| 1126 | - if ($globalDBdriver == 'mysql') { |
|
| 1125 | + if ($olderthanmonths > 0) { |
|
| 1126 | + if ($globalDBdriver == 'mysql') { |
|
| 1127 | 1127 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1128 | 1128 | } else { |
| 1129 | 1129 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1130 | 1130 | } |
| 1131 | 1131 | } |
| 1132 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1132 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1133 | 1133 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1134 | 1134 | if ($limit) $query .= " LIMIT 0,10"; |
| 1135 | 1135 | |
@@ -1142,23 +1142,23 @@ discard block |
||
| 1142 | 1142 | |
| 1143 | 1143 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1144 | 1144 | { |
| 1145 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1146 | - $temp_array['flight_country'] = $row['name']; |
|
| 1147 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1148 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1149 | - $flight_array[] = $temp_array; |
|
| 1145 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1146 | + $temp_array['flight_country'] = $row['name']; |
|
| 1147 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1148 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1149 | + $flight_array[] = $temp_array; |
|
| 1150 | 1150 | } |
| 1151 | 1151 | return $flight_array; |
| 1152 | - } |
|
| 1153 | - |
|
| 1154 | - /** |
|
| 1155 | - * Gets all number of flight over countries |
|
| 1156 | - * |
|
| 1157 | - * @return Array the airline country list |
|
| 1158 | - * |
|
| 1159 | - */ |
|
| 1160 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1161 | - { |
|
| 1152 | + } |
|
| 1153 | + |
|
| 1154 | + /** |
|
| 1155 | + * Gets all number of flight over countries |
|
| 1156 | + * |
|
| 1157 | + * @return Array the airline country list |
|
| 1158 | + * |
|
| 1159 | + */ |
|
| 1160 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1161 | + { |
|
| 1162 | 1162 | global $globalDBdriver; |
| 1163 | 1163 | /* |
| 1164 | 1164 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1168,14 +1168,14 @@ discard block |
||
| 1168 | 1168 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1169 | 1169 | FROM countries c, spotter_archive s, spotter_output o |
| 1170 | 1170 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id "; |
| 1171 | - if ($olderthanmonths > 0) { |
|
| 1172 | - if ($globalDBdriver == 'mysql') { |
|
| 1171 | + if ($olderthanmonths > 0) { |
|
| 1172 | + if ($globalDBdriver == 'mysql') { |
|
| 1173 | 1173 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1174 | 1174 | } else { |
| 1175 | 1175 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1176 | 1176 | } |
| 1177 | 1177 | } |
| 1178 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1178 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1179 | 1179 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1180 | 1180 | if ($limit) $query .= " LIMIT 0,10"; |
| 1181 | 1181 | |
@@ -1188,24 +1188,24 @@ discard block |
||
| 1188 | 1188 | |
| 1189 | 1189 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1190 | 1190 | { |
| 1191 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1192 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1193 | - $temp_array['flight_country'] = $row['name']; |
|
| 1194 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1195 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1196 | - $flight_array[] = $temp_array; |
|
| 1191 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1192 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1193 | + $temp_array['flight_country'] = $row['name']; |
|
| 1194 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1195 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1196 | + $flight_array[] = $temp_array; |
|
| 1197 | 1197 | } |
| 1198 | 1198 | return $flight_array; |
| 1199 | - } |
|
| 1200 | - |
|
| 1201 | - /** |
|
| 1202 | - * Gets last spotter information based on a particular callsign |
|
| 1203 | - * |
|
| 1204 | - * @return Array the spotter information |
|
| 1205 | - * |
|
| 1206 | - */ |
|
| 1207 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1208 | - { |
|
| 1199 | + } |
|
| 1200 | + |
|
| 1201 | + /** |
|
| 1202 | + * Gets last spotter information based on a particular callsign |
|
| 1203 | + * |
|
| 1204 | + * @return Array the spotter information |
|
| 1205 | + * |
|
| 1206 | + */ |
|
| 1207 | + public function getDateArchiveSpotterDataById($id,$date) |
|
| 1208 | + { |
|
| 1209 | 1209 | $Spotter = new Spotter($this->db); |
| 1210 | 1210 | date_default_timezone_set('UTC'); |
| 1211 | 1211 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1213,16 +1213,16 @@ discard block |
||
| 1213 | 1213 | $date = date('c',$date); |
| 1214 | 1214 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1215 | 1215 | return $spotter_array; |
| 1216 | - } |
|
| 1217 | - |
|
| 1218 | - /** |
|
| 1219 | - * Gets all the spotter information based on a particular callsign |
|
| 1220 | - * |
|
| 1221 | - * @return Array the spotter information |
|
| 1222 | - * |
|
| 1223 | - */ |
|
| 1224 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1225 | - { |
|
| 1216 | + } |
|
| 1217 | + |
|
| 1218 | + /** |
|
| 1219 | + * Gets all the spotter information based on a particular callsign |
|
| 1220 | + * |
|
| 1221 | + * @return Array the spotter information |
|
| 1222 | + * |
|
| 1223 | + */ |
|
| 1224 | + public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1225 | + { |
|
| 1226 | 1226 | $Spotter = new Spotter($this->db); |
| 1227 | 1227 | date_default_timezone_set('UTC'); |
| 1228 | 1228 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1230,16 +1230,16 @@ discard block |
||
| 1230 | 1230 | $date = date('c',$date); |
| 1231 | 1231 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1232 | 1232 | return $spotter_array; |
| 1233 | - } |
|
| 1234 | - |
|
| 1235 | - /** |
|
| 1236 | - * Gets all the spotter information based on the airport |
|
| 1237 | - * |
|
| 1238 | - * @return Array the spotter information |
|
| 1239 | - * |
|
| 1240 | - */ |
|
| 1241 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1242 | - { |
|
| 1233 | + } |
|
| 1234 | + |
|
| 1235 | + /** |
|
| 1236 | + * Gets all the spotter information based on the airport |
|
| 1237 | + * |
|
| 1238 | + * @return Array the spotter information |
|
| 1239 | + * |
|
| 1240 | + */ |
|
| 1241 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1242 | + { |
|
| 1243 | 1243 | global $global_query; |
| 1244 | 1244 | $Spotter = new Spotter(); |
| 1245 | 1245 | date_default_timezone_set('UTC'); |
@@ -1250,35 +1250,35 @@ discard block |
||
| 1250 | 1250 | |
| 1251 | 1251 | if ($airport != "") |
| 1252 | 1252 | { |
| 1253 | - if (!is_string($airport)) |
|
| 1254 | - { |
|
| 1253 | + if (!is_string($airport)) |
|
| 1254 | + { |
|
| 1255 | 1255 | return false; |
| 1256 | - } else { |
|
| 1256 | + } else { |
|
| 1257 | 1257 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))"; |
| 1258 | 1258 | $query_values = array(':airport' => $airport); |
| 1259 | - } |
|
| 1259 | + } |
|
| 1260 | 1260 | } |
| 1261 | 1261 | |
| 1262 | 1262 | if ($limit != "") |
| 1263 | 1263 | { |
| 1264 | - $limit_array = explode(",", $limit); |
|
| 1264 | + $limit_array = explode(",", $limit); |
|
| 1265 | 1265 | |
| 1266 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1268 | 1268 | |
| 1269 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1270 | - { |
|
| 1269 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1270 | + { |
|
| 1271 | 1271 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1272 | 1272 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1273 | - } |
|
| 1273 | + } |
|
| 1274 | 1274 | } |
| 1275 | 1275 | |
| 1276 | 1276 | if ($sort != "") |
| 1277 | 1277 | { |
| 1278 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1279 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1278 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1279 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1280 | 1280 | } else { |
| 1281 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1281 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1282 | 1282 | } |
| 1283 | 1283 | |
| 1284 | 1284 | $query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1286,6 +1286,6 @@ discard block |
||
| 1286 | 1286 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1287 | 1287 | |
| 1288 | 1288 | return $spotter_array; |
| 1289 | - } |
|
| 1289 | + } |
|
| 1290 | 1290 | } |
| 1291 | 1291 | ?> |
| 1292 | 1292 | \ No newline at end of file |
@@ -13,62 +13,62 @@ discard block |
||
| 13 | 13 | * @param Array $filter the filter |
| 14 | 14 | * @return Array the SQL part |
| 15 | 15 | */ |
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 16 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 20 | 20 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 21 | 21 | $filters = $globalStatsFilters[$globalFilterName]; |
| 22 | 22 | } else { |
| 23 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 23 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | if (isset($filter[0]['source'])) { |
| 27 | - $filters = array_merge($filters,$filter); |
|
| 27 | + $filters = array_merge($filters, $filter); |
|
| 28 | 28 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 29 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | - foreach($filters as $flt) { |
|
| 32 | + foreach ($filters as $flt) { |
|
| 33 | 33 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 34 | 34 | if ($flt['airlines'][0] != '') { |
| 35 | 35 | if (isset($flt['source'])) { |
| 36 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 36 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 37 | 37 | } else { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 43 | 43 | if (isset($flt['source'])) { |
| 44 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 44 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | 45 | } else { |
| 46 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 50 | 50 | if (isset($flt['source'])) { |
| 51 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 51 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | 52 | } else { |
| 53 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 57 | 57 | if (isset($flt['source'])) { |
| 58 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 58 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | 59 | } else { |
| 60 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 64 | 64 | if (isset($flt['source'])) { |
| 65 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 65 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 70 | 70 | if ($filter['airlines'][0] != '') { |
| 71 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 71 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
@@ -76,16 +76,16 @@ discard block |
||
| 76 | 76 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 82 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 85 | 85 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 88 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 88 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 89 | 89 | } |
| 90 | 90 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 91 | 91 | $filter_query_date = ''; |
@@ -111,41 +111,41 @@ discard block |
||
| 111 | 111 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 114 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 115 | 115 | } |
| 116 | 116 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 117 | 117 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 118 | 118 | if ($filter_query_where != '') { |
| 119 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 119 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 120 | 120 | } |
| 121 | 121 | $filter_query = $filter_query_join.$filter_query_where; |
| 122 | 122 | return $filter_query; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | // Spotter_archive |
| 126 | - public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
|
| 126 | + public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') { |
|
| 127 | 127 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 128 | 128 | if ($over_country == '') { |
| 129 | 129 | $Spotter = new Spotter($this->db); |
| 130 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 130 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 131 | 131 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 132 | 132 | else $country = ''; |
| 133 | 133 | } else $country = $over_country; |
| 134 | - if ($airline_type === NULL) $airline_type =''; |
|
| 134 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 135 | 135 | |
| 136 | 136 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 137 | 137 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 138 | 138 | |
| 139 | 139 | // Route is not added in spotter_archive |
| 140 | - $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 140 | + $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 141 | 141 | VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)"; |
| 142 | 142 | |
| 143 | - $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude); |
|
| 143 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude); |
|
| 144 | 144 | try { |
| 145 | 145 | $sth = $this->db->prepare($query); |
| 146 | 146 | $sth->execute($query_values); |
| 147 | 147 | $sth->closeCursor(); |
| 148 | - } catch(PDOException $e) { |
|
| 148 | + } catch (PDOException $e) { |
|
| 149 | 149 | return "error : ".$e->getMessage(); |
| 150 | 150 | } |
| 151 | 151 | return "success"; |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | |
| 166 | 166 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 167 | 167 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 168 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 169 | 169 | |
| 170 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 171 | 171 | |
| 172 | 172 | return $spotter_array; |
| 173 | 173 | } |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 187 | 187 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 188 | 188 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 189 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 190 | 190 | |
| 191 | 191 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 192 | 192 | /* |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 201 | 201 | */ |
| 202 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 203 | 203 | |
| 204 | 204 | return $spotter_array; |
| 205 | 205 | } |
@@ -214,14 +214,14 @@ discard block |
||
| 214 | 214 | { |
| 215 | 215 | date_default_timezone_set('UTC'); |
| 216 | 216 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 217 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 217 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 218 | 218 | |
| 219 | 219 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 220 | 220 | |
| 221 | 221 | try { |
| 222 | 222 | $sth = $this->db->prepare($query); |
| 223 | 223 | $sth->execute(array(':id' => $id)); |
| 224 | - } catch(PDOException $e) { |
|
| 224 | + } catch (PDOException $e) { |
|
| 225 | 225 | echo $e->getMessage(); |
| 226 | 226 | die; |
| 227 | 227 | } |
@@ -240,14 +240,14 @@ discard block |
||
| 240 | 240 | { |
| 241 | 241 | date_default_timezone_set('UTC'); |
| 242 | 242 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 243 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 244 | 244 | |
| 245 | 245 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 246 | 246 | |
| 247 | 247 | try { |
| 248 | 248 | $sth = $this->db->prepare($query); |
| 249 | 249 | $sth->execute(array(':id' => $id)); |
| 250 | - } catch(PDOException $e) { |
|
| 250 | + } catch (PDOException $e) { |
|
| 251 | 251 | echo $e->getMessage(); |
| 252 | 252 | die; |
| 253 | 253 | } |
@@ -269,12 +269,12 @@ discard block |
||
| 269 | 269 | date_default_timezone_set('UTC'); |
| 270 | 270 | |
| 271 | 271 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 272 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 272 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 273 | 273 | |
| 274 | 274 | try { |
| 275 | 275 | $sth = $this->db->prepare($query); |
| 276 | 276 | $sth->execute(array(':ident' => $ident)); |
| 277 | - } catch(PDOException $e) { |
|
| 277 | + } catch (PDOException $e) { |
|
| 278 | 278 | echo $e->getMessage(); |
| 279 | 279 | die; |
| 280 | 280 | } |
@@ -295,12 +295,12 @@ discard block |
||
| 295 | 295 | date_default_timezone_set('UTC'); |
| 296 | 296 | |
| 297 | 297 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 298 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 298 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 299 | 299 | |
| 300 | 300 | try { |
| 301 | 301 | $sth = $this->db->prepare($query); |
| 302 | 302 | $sth->execute(array(':id' => $id)); |
| 303 | - } catch(PDOException $e) { |
|
| 303 | + } catch (PDOException $e) { |
|
| 304 | 304 | echo $e->getMessage(); |
| 305 | 305 | die; |
| 306 | 306 | } |
@@ -321,12 +321,12 @@ discard block |
||
| 321 | 321 | date_default_timezone_set('UTC'); |
| 322 | 322 | |
| 323 | 323 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 324 | - $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 324 | + $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 325 | 325 | |
| 326 | 326 | try { |
| 327 | 327 | $sth = $this->db->prepare($query); |
| 328 | 328 | $sth->execute(array(':id' => $id)); |
| 329 | - } catch(PDOException $e) { |
|
| 329 | + } catch (PDOException $e) { |
|
| 330 | 330 | echo $e->getMessage(); |
| 331 | 331 | die; |
| 332 | 332 | } |
@@ -348,13 +348,13 @@ discard block |
||
| 348 | 348 | date_default_timezone_set('UTC'); |
| 349 | 349 | |
| 350 | 350 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 351 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 351 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 352 | 352 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 353 | 353 | |
| 354 | 354 | try { |
| 355 | 355 | $sth = $this->db->prepare($query); |
| 356 | 356 | $sth->execute(array(':ident' => $ident)); |
| 357 | - } catch(PDOException $e) { |
|
| 357 | + } catch (PDOException $e) { |
|
| 358 | 358 | echo $e->getMessage(); |
| 359 | 359 | die; |
| 360 | 360 | } |
@@ -371,13 +371,13 @@ discard block |
||
| 371 | 371 | * @return Array the spotter information |
| 372 | 372 | * |
| 373 | 373 | */ |
| 374 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 374 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) |
|
| 375 | 375 | { |
| 376 | 376 | $Spotter = new Spotter($this->db); |
| 377 | 377 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 378 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 378 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 379 | 379 | |
| 380 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 380 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 381 | 381 | |
| 382 | 382 | return $spotter_array; |
| 383 | 383 | } |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | try { |
| 391 | 391 | $sth = $this->db->prepare($query); |
| 392 | 392 | $sth->execute(); |
| 393 | - } catch(PDOException $e) { |
|
| 393 | + } catch (PDOException $e) { |
|
| 394 | 394 | echo $e->getMessage(); |
| 395 | 395 | die; |
| 396 | 396 | } |
@@ -402,24 +402,24 @@ discard block |
||
| 402 | 402 | * @return Array the spotter information |
| 403 | 403 | * |
| 404 | 404 | */ |
| 405 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 405 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) |
|
| 406 | 406 | { |
| 407 | 407 | global $globalDBdriver, $globalLiveInterval; |
| 408 | 408 | date_default_timezone_set('UTC'); |
| 409 | 409 | |
| 410 | 410 | $filter_query = ''; |
| 411 | 411 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 412 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 412 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 413 | 413 | } |
| 414 | 414 | // Use spotter_output also ? |
| 415 | 415 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 416 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 416 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 417 | 417 | } |
| 418 | 418 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 419 | 419 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 420 | 420 | } |
| 421 | 421 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 422 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 422 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -438,14 +438,14 @@ discard block |
||
| 438 | 438 | GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id |
| 439 | 439 | AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 440 | 440 | */ |
| 441 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 441 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 442 | 442 | FROM spotter_archive |
| 443 | 443 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 444 | 444 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 445 | 445 | '.$filter_query.' ORDER BY flightaware_id'; |
| 446 | 446 | } else { |
| 447 | 447 | //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
| 448 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 448 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 449 | 449 | FROM spotter_archive |
| 450 | 450 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 451 | 451 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | try { |
| 456 | 456 | $sth = $this->db->prepare($query); |
| 457 | 457 | $sth->execute(); |
| 458 | - } catch(PDOException $e) { |
|
| 458 | + } catch (PDOException $e) { |
|
| 459 | 459 | echo $e->getMessage(); |
| 460 | 460 | die; |
| 461 | 461 | } |
@@ -470,24 +470,24 @@ discard block |
||
| 470 | 470 | * @return Array the spotter information |
| 471 | 471 | * |
| 472 | 472 | */ |
| 473 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 473 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) |
|
| 474 | 474 | { |
| 475 | 475 | global $globalDBdriver, $globalLiveInterval; |
| 476 | 476 | date_default_timezone_set('UTC'); |
| 477 | 477 | |
| 478 | 478 | $filter_query = ''; |
| 479 | 479 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 480 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 480 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 481 | 481 | } |
| 482 | 482 | // Should use spotter_output also ? |
| 483 | 483 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 484 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 484 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 485 | 485 | } |
| 486 | 486 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 487 | 487 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 488 | 488 | } |
| 489 | 489 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 490 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 490 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | FROM spotter_archive |
| 498 | 498 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 499 | 499 | */ |
| 500 | - $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 500 | + $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 501 | 501 | FROM spotter_archive_output |
| 502 | 502 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 503 | 503 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 513 | 513 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 514 | 514 | */ |
| 515 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 515 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 516 | 516 | FROM spotter_archive_output |
| 517 | 517 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 518 | 518 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | try { |
| 525 | 525 | $sth = $this->db->prepare($query); |
| 526 | 526 | $sth->execute(); |
| 527 | - } catch(PDOException $e) { |
|
| 527 | + } catch (PDOException $e) { |
|
| 528 | 528 | echo $e->getMessage(); |
| 529 | 529 | die; |
| 530 | 530 | } |
@@ -539,23 +539,23 @@ discard block |
||
| 539 | 539 | * @return Array the spotter information |
| 540 | 540 | * |
| 541 | 541 | */ |
| 542 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 542 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) |
|
| 543 | 543 | { |
| 544 | 544 | global $globalDBdriver, $globalLiveInterval; |
| 545 | 545 | date_default_timezone_set('UTC'); |
| 546 | 546 | |
| 547 | 547 | $filter_query = ''; |
| 548 | 548 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 549 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 549 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 550 | 550 | } |
| 551 | 551 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 552 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 552 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 553 | 553 | } |
| 554 | 554 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 555 | 555 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 556 | 556 | } |
| 557 | 557 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 558 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 558 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | try { |
| 571 | 571 | $sth = $this->db->prepare($query); |
| 572 | 572 | $sth->execute(); |
| 573 | - } catch(PDOException $e) { |
|
| 573 | + } catch (PDOException $e) { |
|
| 574 | 574 | echo $e->getMessage(); |
| 575 | 575 | die; |
| 576 | 576 | } |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | * @return Array the spotter information |
| 591 | 591 | * |
| 592 | 592 | */ |
| 593 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 593 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 594 | 594 | { |
| 595 | 595 | global $globalTimezone, $globalDBdriver; |
| 596 | 596 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | |
| 613 | 613 | $q_array = explode(" ", $q); |
| 614 | 614 | |
| 615 | - foreach ($q_array as $q_item){ |
|
| 615 | + foreach ($q_array as $q_item) { |
|
| 616 | 616 | $additional_query .= " AND ("; |
| 617 | 617 | $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 618 | 618 | $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -644,7 +644,7 @@ discard block |
||
| 644 | 644 | |
| 645 | 645 | if ($registration != "") |
| 646 | 646 | { |
| 647 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 647 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 648 | 648 | if (!is_string($registration)) |
| 649 | 649 | { |
| 650 | 650 | return false; |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | |
| 656 | 656 | if ($aircraft_icao != "") |
| 657 | 657 | { |
| 658 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 658 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 659 | 659 | if (!is_string($aircraft_icao)) |
| 660 | 660 | { |
| 661 | 661 | return false; |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | |
| 667 | 667 | if ($aircraft_manufacturer != "") |
| 668 | 668 | { |
| 669 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 669 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 670 | 670 | if (!is_string($aircraft_manufacturer)) |
| 671 | 671 | { |
| 672 | 672 | return false; |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | |
| 688 | 688 | if ($airline_icao != "") |
| 689 | 689 | { |
| 690 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 690 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 691 | 691 | if (!is_string($airline_icao)) |
| 692 | 692 | { |
| 693 | 693 | return false; |
@@ -698,7 +698,7 @@ discard block |
||
| 698 | 698 | |
| 699 | 699 | if ($airline_country != "") |
| 700 | 700 | { |
| 701 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 701 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 702 | 702 | if (!is_string($airline_country)) |
| 703 | 703 | { |
| 704 | 704 | return false; |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | |
| 710 | 710 | if ($airline_type != "") |
| 711 | 711 | { |
| 712 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 712 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 713 | 713 | if (!is_string($airline_type)) |
| 714 | 714 | { |
| 715 | 715 | return false; |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | |
| 732 | 732 | if ($airport != "") |
| 733 | 733 | { |
| 734 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 734 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 735 | 735 | if (!is_string($airport)) |
| 736 | 736 | { |
| 737 | 737 | return false; |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | |
| 743 | 743 | if ($airport_country != "") |
| 744 | 744 | { |
| 745 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 745 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 746 | 746 | if (!is_string($airport_country)) |
| 747 | 747 | { |
| 748 | 748 | return false; |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | |
| 754 | 754 | if ($callsign != "") |
| 755 | 755 | { |
| 756 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 756 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 757 | 757 | if (!is_string($callsign)) |
| 758 | 758 | { |
| 759 | 759 | return false; |
@@ -761,7 +761,7 @@ discard block |
||
| 761 | 761 | $translate = $Translation->ident2icao($callsign); |
| 762 | 762 | if ($translate != $callsign) { |
| 763 | 763 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 764 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 764 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 765 | 765 | } else { |
| 766 | 766 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 767 | 767 | } |
@@ -770,7 +770,7 @@ discard block |
||
| 770 | 770 | |
| 771 | 771 | if ($owner != "") |
| 772 | 772 | { |
| 773 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 773 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 774 | 774 | if (!is_string($owner)) |
| 775 | 775 | { |
| 776 | 776 | return false; |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | |
| 782 | 782 | if ($pilot_name != "") |
| 783 | 783 | { |
| 784 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 784 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 785 | 785 | if (!is_string($pilot_name)) |
| 786 | 786 | { |
| 787 | 787 | return false; |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | |
| 793 | 793 | if ($pilot_id != "") |
| 794 | 794 | { |
| 795 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 795 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 796 | 796 | if (!is_string($pilot_id)) |
| 797 | 797 | { |
| 798 | 798 | return false; |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | |
| 804 | 804 | if ($departure_airport_route != "") |
| 805 | 805 | { |
| 806 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 806 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 807 | 807 | if (!is_string($departure_airport_route)) |
| 808 | 808 | { |
| 809 | 809 | return false; |
@@ -814,7 +814,7 @@ discard block |
||
| 814 | 814 | |
| 815 | 815 | if ($arrival_airport_route != "") |
| 816 | 816 | { |
| 817 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 817 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 818 | 818 | if (!is_string($arrival_airport_route)) |
| 819 | 819 | { |
| 820 | 820 | return false; |
@@ -827,8 +827,8 @@ discard block |
||
| 827 | 827 | { |
| 828 | 828 | $altitude_array = explode(",", $altitude); |
| 829 | 829 | |
| 830 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 832 | 832 | |
| 833 | 833 | |
| 834 | 834 | if ($altitude_array[1] != "") |
@@ -846,8 +846,8 @@ discard block |
||
| 846 | 846 | { |
| 847 | 847 | $date_array = explode(",", $date_posted); |
| 848 | 848 | |
| 849 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 850 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 849 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 850 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 851 | 851 | |
| 852 | 852 | if ($globalTimezone != '') { |
| 853 | 853 | date_default_timezone_set($globalTimezone); |
@@ -879,8 +879,8 @@ discard block |
||
| 879 | 879 | { |
| 880 | 880 | $limit_array = explode(",", $limit); |
| 881 | 881 | |
| 882 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 884 | 884 | |
| 885 | 885 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 886 | 886 | { |
@@ -891,8 +891,8 @@ discard block |
||
| 891 | 891 | |
| 892 | 892 | |
| 893 | 893 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 894 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 895 | - $query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 894 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 895 | + $query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 896 | 896 | FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 897 | 897 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 898 | 898 | } else { |
@@ -909,12 +909,12 @@ discard block |
||
| 909 | 909 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 910 | 910 | } |
| 911 | 911 | |
| 912 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 912 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 913 | 913 | WHERE spotter_archive_output.ident <> '' |
| 914 | 914 | ".$additional_query." |
| 915 | 915 | ".$filter_query.$orderby_query; |
| 916 | 916 | } |
| 917 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 917 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 918 | 918 | |
| 919 | 919 | return $spotter_array; |
| 920 | 920 | } |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | try { |
| 932 | 932 | $sth = $this->db->prepare($query); |
| 933 | 933 | $sth->execute(); |
| 934 | - } catch(PDOException $e) { |
|
| 934 | + } catch (PDOException $e) { |
|
| 935 | 935 | return "error"; |
| 936 | 936 | } |
| 937 | 937 | } |
@@ -968,8 +968,8 @@ discard block |
||
| 968 | 968 | { |
| 969 | 969 | $limit_array = explode(",", $limit); |
| 970 | 970 | |
| 971 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 973 | 973 | |
| 974 | 974 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 975 | 975 | { |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | $query_values = array(); |
| 1011 | 1011 | $limit_query = ''; |
| 1012 | 1012 | $additional_query = ''; |
| 1013 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1013 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1014 | 1014 | |
| 1015 | 1015 | if ($owner != "") |
| 1016 | 1016 | { |
@@ -1027,8 +1027,8 @@ discard block |
||
| 1027 | 1027 | { |
| 1028 | 1028 | $limit_array = explode(",", $limit); |
| 1029 | 1029 | |
| 1030 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1032 | 1032 | |
| 1033 | 1033 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1034 | 1034 | { |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | $query_values = array(); |
| 1069 | 1069 | $limit_query = ''; |
| 1070 | 1070 | $additional_query = ''; |
| 1071 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1071 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1072 | 1072 | |
| 1073 | 1073 | if ($pilot != "") |
| 1074 | 1074 | { |
@@ -1080,8 +1080,8 @@ discard block |
||
| 1080 | 1080 | { |
| 1081 | 1081 | $limit_array = explode(",", $limit); |
| 1082 | 1082 | |
| 1083 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1085 | 1085 | |
| 1086 | 1086 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1087 | 1087 | { |
@@ -1111,7 +1111,7 @@ discard block |
||
| 1111 | 1111 | * @return Array the airline country list |
| 1112 | 1112 | * |
| 1113 | 1113 | */ |
| 1114 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1114 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1115 | 1115 | { |
| 1116 | 1116 | global $globalDBdriver; |
| 1117 | 1117 | /* |
@@ -1140,7 +1140,7 @@ discard block |
||
| 1140 | 1140 | $flight_array = array(); |
| 1141 | 1141 | $temp_array = array(); |
| 1142 | 1142 | |
| 1143 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1143 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1144 | 1144 | { |
| 1145 | 1145 | $temp_array['flight_count'] = $row['nb']; |
| 1146 | 1146 | $temp_array['flight_country'] = $row['name']; |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | * @return Array the airline country list |
| 1158 | 1158 | * |
| 1159 | 1159 | */ |
| 1160 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1160 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1161 | 1161 | { |
| 1162 | 1162 | global $globalDBdriver; |
| 1163 | 1163 | /* |
@@ -1186,7 +1186,7 @@ discard block |
||
| 1186 | 1186 | $flight_array = array(); |
| 1187 | 1187 | $temp_array = array(); |
| 1188 | 1188 | |
| 1189 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1189 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1190 | 1190 | { |
| 1191 | 1191 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1192 | 1192 | $temp_array['flight_count'] = $row['nb']; |
@@ -1204,14 +1204,14 @@ discard block |
||
| 1204 | 1204 | * @return Array the spotter information |
| 1205 | 1205 | * |
| 1206 | 1206 | */ |
| 1207 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1207 | + public function getDateArchiveSpotterDataById($id, $date) |
|
| 1208 | 1208 | { |
| 1209 | 1209 | $Spotter = new Spotter($this->db); |
| 1210 | 1210 | date_default_timezone_set('UTC'); |
| 1211 | 1211 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1212 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | - $date = date('c',$date); |
|
| 1214 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1212 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | + $date = date('c', $date); |
|
| 1214 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1215 | 1215 | return $spotter_array; |
| 1216 | 1216 | } |
| 1217 | 1217 | |
@@ -1221,14 +1221,14 @@ discard block |
||
| 1221 | 1221 | * @return Array the spotter information |
| 1222 | 1222 | * |
| 1223 | 1223 | */ |
| 1224 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1224 | + public function getDateArchiveSpotterDataByIdent($ident, $date) |
|
| 1225 | 1225 | { |
| 1226 | 1226 | $Spotter = new Spotter($this->db); |
| 1227 | 1227 | date_default_timezone_set('UTC'); |
| 1228 | 1228 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1229 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1230 | - $date = date('c',$date); |
|
| 1231 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1229 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1230 | + $date = date('c', $date); |
|
| 1231 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1232 | 1232 | return $spotter_array; |
| 1233 | 1233 | } |
| 1234 | 1234 | |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | * @return Array the spotter information |
| 1239 | 1239 | * |
| 1240 | 1240 | */ |
| 1241 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1241 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1242 | 1242 | { |
| 1243 | 1243 | global $global_query; |
| 1244 | 1244 | $Spotter = new Spotter(); |
@@ -1246,7 +1246,7 @@ discard block |
||
| 1246 | 1246 | $query_values = array(); |
| 1247 | 1247 | $limit_query = ''; |
| 1248 | 1248 | $additional_query = ''; |
| 1249 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1249 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1250 | 1250 | |
| 1251 | 1251 | if ($airport != "") |
| 1252 | 1252 | { |
@@ -1263,8 +1263,8 @@ discard block |
||
| 1263 | 1263 | { |
| 1264 | 1264 | $limit_array = explode(",", $limit); |
| 1265 | 1265 | |
| 1266 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1268 | 1268 | |
| 1269 | 1269 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1270 | 1270 | { |
@@ -8,20 +8,20 @@ discard block |
||
| 8 | 8 | require_once(dirname(__FILE__).'/class.Stats.php'); |
| 9 | 9 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 10 | 10 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
| 11 | - require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 11 | + require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | class SpotterImport { |
| 15 | - private $all_flights = array(); |
|
| 16 | - private $last_delete_hourly = 0; |
|
| 17 | - private $last_delete = 0; |
|
| 18 | - private $stats = array(); |
|
| 19 | - private $tmd = 0; |
|
| 20 | - private $source_location = array(); |
|
| 21 | - public $db = null; |
|
| 22 | - public $nb = 0; |
|
| 23 | - |
|
| 24 | - public function __construct($dbc = null) { |
|
| 15 | + private $all_flights = array(); |
|
| 16 | + private $last_delete_hourly = 0; |
|
| 17 | + private $last_delete = 0; |
|
| 18 | + private $stats = array(); |
|
| 19 | + private $tmd = 0; |
|
| 20 | + private $source_location = array(); |
|
| 21 | + public $db = null; |
|
| 22 | + public $nb = 0; |
|
| 23 | + |
|
| 24 | + public function __construct($dbc = null) { |
|
| 25 | 25 | global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB; |
| 26 | 26 | if (!(isset($globalNoDB) && $globalNoDB)) { |
| 27 | 27 | $Connection = new Connection($dbc); |
@@ -33,14 +33,14 @@ discard block |
||
| 33 | 33 | $currentdate = date('Y-m-d'); |
| 34 | 34 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 35 | 35 | if (!empty($sourcestat)) { |
| 36 | - foreach($sourcestat as $srcst) { |
|
| 37 | - $type = $srcst['stats_type']; |
|
| 36 | + foreach($sourcestat as $srcst) { |
|
| 37 | + $type = $srcst['stats_type']; |
|
| 38 | 38 | if ($type == 'polar' || $type == 'hist') { |
| 39 | - $source = $srcst['source_name']; |
|
| 40 | - $data = $srcst['source_data']; |
|
| 41 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 42 | - } |
|
| 43 | - } |
|
| 39 | + $source = $srcst['source_name']; |
|
| 40 | + $data = $srcst['source_data']; |
|
| 41 | + $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 42 | + } |
|
| 43 | + } |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | //$APRSSpotter->connect(); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - } |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - public function get_Schedule($id,$ident) { |
|
| 53 | + public function get_Schedule($id,$ident) { |
|
| 54 | 54 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 55 | 55 | // Get schedule here, so it's done only one time |
| 56 | 56 | |
@@ -70,42 +70,42 @@ discard block |
||
| 70 | 70 | $operator = $Spotter->getOperator($ident); |
| 71 | 71 | $scheduleexist = false; |
| 72 | 72 | if ($Schedule->checkSchedule($operator) == 0) { |
| 73 | - $operator = $Translation->checkTranslation($ident); |
|
| 74 | - if ($Schedule->checkSchedule($operator) == 0) { |
|
| 73 | + $operator = $Translation->checkTranslation($ident); |
|
| 74 | + if ($Schedule->checkSchedule($operator) == 0) { |
|
| 75 | 75 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 76 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 78 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | - // Should also check if route schedule = route from DB |
|
| 81 | - if ($schedule['DepartureAirportIATA'] != '') { |
|
| 77 | + if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 78 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | + // Should also check if route schedule = route from DB |
|
| 81 | + if ($schedule['DepartureAirportIATA'] != '') { |
|
| 82 | 82 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
| 83 | - $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
|
| 84 | - if (trim($airport_icao) != '') { |
|
| 83 | + $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
|
| 84 | + if (trim($airport_icao) != '') { |
|
| 85 | 85 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 86 | 86 | if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
| 87 | - } |
|
| 87 | + } |
|
| 88 | + } |
|
| 88 | 89 | } |
| 89 | - } |
|
| 90 | - if ($schedule['ArrivalAirportIATA'] != '') { |
|
| 90 | + if ($schedule['ArrivalAirportIATA'] != '') { |
|
| 91 | 91 | if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) { |
| 92 | - $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
|
| 93 | - if (trim($airport_icao) != '') { |
|
| 92 | + $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
|
| 93 | + if (trim($airport_icao) != '') { |
|
| 94 | 94 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 95 | 95 | if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
| 96 | - } |
|
| 96 | + } |
|
| 97 | 97 | } |
| 98 | - } |
|
| 99 | - $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 98 | + } |
|
| 99 | + $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 100 | 100 | } |
| 101 | - } else $scheduleexist = true; |
|
| 101 | + } else $scheduleexist = true; |
|
| 102 | 102 | } else $scheduleexist = true; |
| 103 | 103 | // close connection, at least one way will work ? |
| 104 | - if ($scheduleexist) { |
|
| 104 | + if ($scheduleexist) { |
|
| 105 | 105 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 106 | - $sch = $Schedule->getSchedule($operator); |
|
| 106 | + $sch = $Schedule->getSchedule($operator); |
|
| 107 | 107 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
| 108 | - } |
|
| 108 | + } |
|
| 109 | 109 | $Spotter->db = null; |
| 110 | 110 | $Schedule->db = null; |
| 111 | 111 | $Translation->db = null; |
@@ -120,78 +120,78 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | */ |
| 122 | 122 | } |
| 123 | - } |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - public function checkAll() { |
|
| 125 | + public function checkAll() { |
|
| 126 | 126 | global $globalDebug, $globalNoImport; |
| 127 | 127 | if ($globalDebug) echo "Update last seen flights data...\n"; |
| 128 | 128 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 129 | - foreach ($this->all_flights as $key => $flight) { |
|
| 129 | + foreach ($this->all_flights as $key => $flight) { |
|
| 130 | 130 | if (isset($this->all_flights[$key]['id'])) { |
| 131 | - //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
| 132 | - $Spotter = new Spotter($this->db); |
|
| 133 | - $real_arrival = $this->arrival($key); |
|
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 135 | - } |
|
| 136 | - } |
|
| 131 | + //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
| 132 | + $Spotter = new Spotter($this->db); |
|
| 133 | + $real_arrival = $this->arrival($key); |
|
| 134 | + if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 135 | + } |
|
| 136 | + } |
|
| 137 | + } |
|
| 137 | 138 | } |
| 138 | - } |
|
| 139 | 139 | |
| 140 | - public function arrival($key) { |
|
| 140 | + public function arrival($key) { |
|
| 141 | 141 | global $globalClosestMinDist, $globalDebug; |
| 142 | 142 | if ($globalDebug) echo 'Update arrival...'."\n"; |
| 143 | 143 | $Spotter = new Spotter($this->db); |
| 144 | - $airport_icao = ''; |
|
| 145 | - $airport_time = ''; |
|
| 146 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 144 | + $airport_icao = ''; |
|
| 145 | + $airport_time = ''; |
|
| 146 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 147 | 147 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 149 | - if (isset($closestAirports[0])) { |
|
| 150 | - if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
| 151 | - $airport_icao = $closestAirports[0]['icao']; |
|
| 152 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 153 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 154 | - } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
|
| 155 | - foreach ($closestAirports as $airport) { |
|
| 156 | - if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
|
| 157 | - $airport_icao = $airport['icao']; |
|
| 158 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 159 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 160 | - break; |
|
| 161 | - } |
|
| 162 | - } |
|
| 163 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 164 | - $airport_icao = $closestAirports[0]['icao']; |
|
| 165 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 166 | - } else { |
|
| 167 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 168 | - } |
|
| 169 | - } else { |
|
| 170 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 171 | - } |
|
| 172 | - |
|
| 173 | - } else { |
|
| 174 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 175 | - } |
|
| 176 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - |
|
| 180 | - |
|
| 181 | - public function del() { |
|
| 148 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 149 | + if (isset($closestAirports[0])) { |
|
| 150 | + if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
| 151 | + $airport_icao = $closestAirports[0]['icao']; |
|
| 152 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 153 | + if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 154 | + } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
|
| 155 | + foreach ($closestAirports as $airport) { |
|
| 156 | + if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
|
| 157 | + $airport_icao = $airport['icao']; |
|
| 158 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 159 | + if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 160 | + break; |
|
| 161 | + } |
|
| 162 | + } |
|
| 163 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 164 | + $airport_icao = $closestAirports[0]['icao']; |
|
| 165 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 166 | + } else { |
|
| 167 | + if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 168 | + } |
|
| 169 | + } else { |
|
| 170 | + if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 171 | + } |
|
| 172 | + |
|
| 173 | + } else { |
|
| 174 | + if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 175 | + } |
|
| 176 | + return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + |
|
| 180 | + |
|
| 181 | + public function del() { |
|
| 182 | 182 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 183 | 183 | // Delete old infos |
| 184 | 184 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 185 | 185 | foreach ($this->all_flights as $key => $flight) { |
| 186 | - if (isset($flight['lastupdate'])) { |
|
| 186 | + if (isset($flight['lastupdate'])) { |
|
| 187 | 187 | if ($flight['lastupdate'] < (time()-5900)) { |
| 188 | - $this->delKey($key); |
|
| 188 | + $this->delKey($key); |
|
| 189 | + } |
|
| 189 | 190 | } |
| 190 | - } |
|
| 191 | 191 | } |
| 192 | - } |
|
| 192 | + } |
|
| 193 | 193 | |
| 194 | - public function delKey($key) { |
|
| 194 | + public function delKey($key) { |
|
| 195 | 195 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 196 | 196 | // Delete old infos |
| 197 | 197 | if (isset($this->all_flights[$key]['id'])) { |
@@ -206,9 +206,9 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | } |
| 208 | 208 | unset($this->all_flights[$key]); |
| 209 | - } |
|
| 209 | + } |
|
| 210 | 210 | |
| 211 | - public function add($line) { |
|
| 211 | + public function add($line) { |
|
| 212 | 212 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate; |
| 213 | 213 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 214 | 214 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
@@ -234,20 +234,20 @@ discard block |
||
| 234 | 234 | |
| 235 | 235 | // SBS format is CSV format |
| 236 | 236 | if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
| 237 | - //print_r($line); |
|
| 238 | - if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 239 | - if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 237 | + //print_r($line); |
|
| 238 | + if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 239 | + if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 240 | 240 | |
| 241 | 241 | // Increment message number |
| 242 | 242 | if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) { |
| 243 | - $current_date = date('Y-m-d'); |
|
| 244 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 245 | - else $source = ''; |
|
| 246 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 247 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 248 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 249 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 250 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 243 | + $current_date = date('Y-m-d'); |
|
| 244 | + if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 245 | + else $source = ''; |
|
| 246 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 247 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 248 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 249 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 250 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | /* |
@@ -263,53 +263,53 @@ discard block |
||
| 263 | 263 | //$this->db = $dbc; |
| 264 | 264 | |
| 265 | 265 | //$hex = trim($line['hex']); |
| 266 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 267 | - else $id = trim($line['id']); |
|
| 266 | + if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 267 | + else $id = trim($line['id']); |
|
| 268 | 268 | |
| 269 | 269 | if (!isset($this->all_flights[$id])) { |
| 270 | - $this->all_flights[$id] = array(); |
|
| 271 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 272 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 273 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 274 | - if (!isset($line['id'])) { |
|
| 270 | + $this->all_flights[$id] = array(); |
|
| 271 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 272 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 273 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 274 | + if (!isset($line['id'])) { |
|
| 275 | 275 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 276 | 276 | // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
| 277 | 277 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 278 | 278 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 279 | - //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 280 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 281 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 279 | + //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 280 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 281 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 282 | 282 | } |
| 283 | 283 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 284 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 284 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | //print_r($this->all_flights); |
| 288 | 288 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 289 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 290 | - //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 289 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 290 | + //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 291 | 291 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 292 | - //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 293 | - if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') { |
|
| 292 | + //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 293 | + if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') { |
|
| 294 | 294 | $timeelapsed = microtime(true); |
| 295 | 295 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 296 | - $Spotter = new Spotter($this->db); |
|
| 297 | - if (isset($this->all_flights[$id]['source_type'])) { |
|
| 296 | + $Spotter = new Spotter($this->db); |
|
| 297 | + if (isset($this->all_flights[$id]['source_type'])) { |
|
| 298 | 298 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
| 299 | - } else { |
|
| 299 | + } else { |
|
| 300 | 300 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 301 | - } |
|
| 302 | - $Spotter->db = null; |
|
| 303 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 304 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 301 | + } |
|
| 302 | + $Spotter->db = null; |
|
| 303 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 304 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 305 | + } |
|
| 305 | 306 | } |
| 306 | - } |
|
| 307 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 308 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 307 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 308 | + if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 309 | 309 | } |
| 310 | - if (isset($line['id']) && !isset($line['hex'])) { |
|
| 311 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 312 | - } |
|
| 310 | + if (isset($line['id']) && !isset($line['hex'])) { |
|
| 311 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 312 | + } |
|
| 313 | 313 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 314 | 314 | $icao = $line['aircraft_icao']; |
| 315 | 315 | $Spotter = new Spotter($this->db); |
@@ -338,9 +338,9 @@ discard block |
||
| 338 | 338 | } |
| 339 | 339 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 340 | 340 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 341 | - if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 341 | + if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 342 | 342 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 343 | - } else { |
|
| 343 | + } else { |
|
| 344 | 344 | if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 345 | 345 | elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 346 | 346 | /* |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | print_r($line); |
| 350 | 350 | */ |
| 351 | 351 | return ''; |
| 352 | - } |
|
| 352 | + } |
|
| 353 | 353 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 354 | 354 | if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
| 355 | 355 | return ''; |
@@ -366,21 +366,21 @@ discard block |
||
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 373 | 373 | } |
| 374 | 374 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 375 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 375 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 376 | 376 | } |
| 377 | 377 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 378 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 378 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 382 | 382 | |
| 383 | - if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 383 | + if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 384 | 384 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 385 | 385 | if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
| 386 | 386 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
@@ -389,23 +389,23 @@ discard block |
||
| 389 | 389 | elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 390 | 390 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 391 | 391 | } else { |
| 392 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 393 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 392 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 393 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 394 | 394 | $timeelapsed = microtime(true); |
| 395 | - $Spotter = new Spotter($this->db); |
|
| 396 | - $fromsource = NULL; |
|
| 397 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 398 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 395 | + $Spotter = new Spotter($this->db); |
|
| 396 | + $fromsource = NULL; |
|
| 397 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 398 | + elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 399 | 399 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 400 | 400 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 401 | 401 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 402 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 402 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 403 | 403 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 404 | 404 | $Spotter->db = null; |
| 405 | 405 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 406 | - } |
|
| 406 | + } |
|
| 407 | 407 | } |
| 408 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 408 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 409 | 409 | |
| 410 | 410 | /* |
| 411 | 411 | if (!isset($line['id'])) { |
@@ -415,90 +415,90 @@ discard block |
||
| 415 | 415 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 416 | 416 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 417 | 417 | */ |
| 418 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 418 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 419 | 419 | |
| 420 | - //$putinarchive = true; |
|
| 421 | - if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 420 | + //$putinarchive = true; |
|
| 421 | + if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 422 | 422 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
| 423 | - } |
|
| 424 | - if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 423 | + } |
|
| 424 | + if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 425 | 425 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
| 426 | - } |
|
| 427 | - if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 428 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 429 | - } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 426 | + } |
|
| 427 | + if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 428 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 429 | + } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 430 | 430 | $timeelapsed = microtime(true); |
| 431 | 431 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 432 | 432 | $Spotter = new Spotter($this->db); |
| 433 | 433 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 434 | 434 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 435 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 435 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 436 | 436 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 437 | - } |
|
| 438 | - } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 437 | + } |
|
| 438 | + } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 439 | 439 | $timeelapsed = microtime(true); |
| 440 | 440 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 441 | - $Spotter = new Spotter($this->db); |
|
| 442 | - $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 443 | - if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 441 | + $Spotter = new Spotter($this->db); |
|
| 442 | + $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 443 | + if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 444 | 444 | $Translation = new Translation($this->db); |
| 445 | 445 | $ident = $Translation->checkTranslation(trim($line['ident'])); |
| 446 | 446 | $route = $Spotter->getRouteInfo($ident); |
| 447 | 447 | $Translation->db = null; |
| 448 | - } |
|
| 449 | - $Spotter->db = null; |
|
| 450 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 451 | - } |
|
| 448 | + } |
|
| 449 | + $Spotter->db = null; |
|
| 450 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 451 | + } |
|
| 452 | 452 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 453 | - //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 454 | - if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 453 | + //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 454 | + if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 455 | 455 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop'])); |
| 456 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 457 | - } |
|
| 456 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 457 | + } |
|
| 458 | 458 | } |
| 459 | 459 | if (!isset($globalFork)) $globalFork = TRUE; |
| 460 | 460 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 461 | 461 | if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
| 462 | 462 | } |
| 463 | - } |
|
| 463 | + } |
|
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | if (isset($line['speed']) && $line['speed'] != '') { |
| 467 | 467 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 468 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 469 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 470 | - //$dataFound = true; |
|
| 468 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 469 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 470 | + //$dataFound = true; |
|
| 471 | 471 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 472 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 473 | - if ($distance > 1000 && $distance < 10000) { |
|
| 474 | - // use datetime |
|
| 472 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 473 | + if ($distance > 1000 && $distance < 10000) { |
|
| 474 | + // use datetime |
|
| 475 | 475 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 476 | 476 | $speed = $speed*3.6; |
| 477 | 477 | if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
| 478 | 478 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 479 | - } |
|
| 479 | + } |
|
| 480 | 480 | } |
| 481 | 481 | |
| 482 | 482 | |
| 483 | 483 | |
| 484 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
|
| 485 | - if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
|
| 486 | - if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 487 | - return false; |
|
| 488 | - } |
|
| 489 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 490 | - else unset($timediff); |
|
| 491 | - if ($this->tmd > 5 || isset($line['format_source']) && $line['format_source'] == 'airwhere' && ((!isset($this->all_flights[$id]['latitude']) || !isset($this->all_flights[$id]['longitude'])) || (isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $this->all_flights[$id]['latitude'] != $line['latitude'] && $this->all_flights[$id]['longitude'] != $line['longitude'])) || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 484 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
|
| 485 | + if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
|
| 486 | + if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 487 | + return false; |
|
| 488 | + } |
|
| 489 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 490 | + else unset($timediff); |
|
| 491 | + if ($this->tmd > 5 || isset($line['format_source']) && $line['format_source'] == 'airwhere' && ((!isset($this->all_flights[$id]['latitude']) || !isset($this->all_flights[$id]['longitude'])) || (isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $this->all_flights[$id]['latitude'] != $line['latitude'] && $this->all_flights[$id]['longitude'] != $line['longitude'])) || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 492 | 492 | if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) { |
| 493 | - if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || isset($line['format_source']) && $line['format_source'] == 'airwhere' || !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 493 | + if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || isset($line['format_source']) && $line['format_source'] == 'airwhere' || !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 494 | 494 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 495 | 495 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 496 | 496 | $this->all_flights[$id]['putinarchive'] = true; |
| 497 | 497 | $this->tmd = 0; |
| 498 | 498 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 499 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 500 | - $timeelapsed = microtime(true); |
|
| 501 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 499 | + if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 500 | + $timeelapsed = microtime(true); |
|
| 501 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 502 | 502 | $Spotter = new Spotter($this->db); |
| 503 | 503 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 504 | 504 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
@@ -506,18 +506,18 @@ discard block |
||
| 506 | 506 | $Spotter->db = null; |
| 507 | 507 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 508 | 508 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 509 | - } |
|
| 509 | + } |
|
| 510 | + } |
|
| 510 | 511 | } |
| 511 | - } |
|
| 512 | 512 | } |
| 513 | 513 | |
| 514 | 514 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 515 | - //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 515 | + //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 516 | 516 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 517 | 517 | if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001) { |
| 518 | - $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 519 | - $dataFound = true; |
|
| 520 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 518 | + $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 519 | + $dataFound = true; |
|
| 520 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 521 | 521 | } |
| 522 | 522 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 523 | 523 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
@@ -528,20 +528,20 @@ discard block |
||
| 528 | 528 | //$putinarchive = true; |
| 529 | 529 | } |
| 530 | 530 | */ |
| 531 | - /* |
|
| 531 | + /* |
|
| 532 | 532 | } elseif (isset($this->all_flights[$id]['latitude'])) { |
| 533 | 533 | if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n"; |
| 534 | 534 | } |
| 535 | 535 | */ |
| 536 | 536 | } |
| 537 | 537 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 538 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 539 | - //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 538 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 539 | + //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 540 | 540 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 541 | 541 | if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001) { |
| 542 | - $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 543 | - $dataFound = true; |
|
| 544 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 542 | + $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 543 | + $dataFound = true; |
|
| 544 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 545 | 545 | } |
| 546 | 546 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 547 | 547 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
@@ -559,77 +559,77 @@ discard block |
||
| 559 | 559 | */ |
| 560 | 560 | } |
| 561 | 561 | |
| 562 | - } else if ($globalDebug && $timediff > 30) { |
|
| 562 | + } else if ($globalDebug && $timediff > 30) { |
|
| 563 | 563 | $this->tmd = $this->tmd + 1; |
| 564 | 564 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 565 | 565 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
| 566 | 566 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 567 | 567 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 568 | - } |
|
| 568 | + } |
|
| 569 | 569 | } |
| 570 | 570 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 571 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 572 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 571 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 572 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 573 | 573 | } |
| 574 | 574 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 575 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 576 | - //$dataFound = true; |
|
| 575 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 576 | + //$dataFound = true; |
|
| 577 | 577 | } |
| 578 | 578 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 579 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 579 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 580 | 580 | } |
| 581 | 581 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 582 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 582 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 583 | 583 | } |
| 584 | 584 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 585 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 586 | - //$dataFound = true; |
|
| 585 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 586 | + //$dataFound = true; |
|
| 587 | 587 | } |
| 588 | 588 | if (isset($line['ground']) && $line['ground'] != '') { |
| 589 | - if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 589 | + if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 590 | 590 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 591 | 591 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 592 | 592 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 593 | 593 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 594 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 594 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 595 | 595 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 596 | - } |
|
| 597 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 598 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 599 | - //$dataFound = true; |
|
| 596 | + } |
|
| 597 | + if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 598 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 599 | + //$dataFound = true; |
|
| 600 | 600 | } |
| 601 | 601 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 602 | - if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
|
| 603 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 604 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 605 | - $highlight = ''; |
|
| 606 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 607 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 608 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 609 | - if ($highlight != '') { |
|
| 602 | + if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
|
| 603 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 604 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 605 | + $highlight = ''; |
|
| 606 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 607 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 608 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 609 | + if ($highlight != '') { |
|
| 610 | 610 | $timeelapsed = microtime(true); |
| 611 | 611 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 612 | - $Spotter = new Spotter($this->db); |
|
| 613 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 614 | - $Spotter->db = null; |
|
| 615 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 612 | + $Spotter = new Spotter($this->db); |
|
| 613 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 614 | + $Spotter->db = null; |
|
| 615 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 616 | 616 | } |
| 617 | 617 | //$putinarchive = true; |
| 618 | 618 | //$highlight = ''; |
| 619 | - } |
|
| 619 | + } |
|
| 620 | 620 | |
| 621 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 622 | - //$dataFound = true; |
|
| 621 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 622 | + //$dataFound = true; |
|
| 623 | 623 | } |
| 624 | 624 | |
| 625 | 625 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 626 | - //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 626 | + //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 627 | 627 | if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
| 628 | 628 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 629 | 629 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 630 | 630 | //$dataFound = true; |
| 631 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 632 | - if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
| 631 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 632 | + if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
| 633 | 633 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 634 | 634 | if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
| 635 | 635 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
@@ -638,27 +638,27 @@ discard block |
||
| 638 | 638 | elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 639 | 639 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 640 | 640 | } |
| 641 | - } |
|
| 642 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 641 | + } |
|
| 642 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 646 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 646 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 647 | 647 | } |
| 648 | 648 | |
| 649 | 649 | if (isset($line['heading']) && $line['heading'] != '') { |
| 650 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 651 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 652 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 653 | - //$dataFound = true; |
|
| 650 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 651 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 652 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 653 | + //$dataFound = true; |
|
| 654 | 654 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 655 | - $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 656 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 657 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 658 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 655 | + $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 656 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 657 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 658 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 659 | 659 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 660 | - // If not enough messages and ACARS set heading to 0 |
|
| 661 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 660 | + // If not enough messages and ACARS set heading to 0 |
|
| 661 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 662 | 662 | } |
| 663 | 663 | if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 664 | 664 | elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
@@ -671,125 +671,125 @@ discard block |
||
| 671 | 671 | //if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 672 | 672 | //if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 673 | 673 | if ($dataFound === true && isset($this->all_flights[$id]['id'])) { |
| 674 | - $this->all_flights[$id]['lastupdate'] = time(); |
|
| 675 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 676 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 677 | - //print_r($this->all_flights); |
|
| 678 | - //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 679 | - //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 680 | - if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 674 | + $this->all_flights[$id]['lastupdate'] = time(); |
|
| 675 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 676 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 677 | + //print_r($this->all_flights); |
|
| 678 | + //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 679 | + //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 680 | + if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 681 | 681 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 682 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 683 | - $timeelapsed = microtime(true); |
|
| 684 | - $SpotterLive = new SpotterLive($this->db); |
|
| 685 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 682 | + if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 683 | + $timeelapsed = microtime(true); |
|
| 684 | + $SpotterLive = new SpotterLive($this->db); |
|
| 685 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 686 | 686 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 687 | 687 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 688 | - } elseif (isset($line['id'])) { |
|
| 688 | + } elseif (isset($line['id'])) { |
|
| 689 | 689 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 690 | 690 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 691 | - } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 691 | + } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 692 | 692 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 693 | 693 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 694 | - } else $recent_ident = ''; |
|
| 695 | - $SpotterLive->db=null; |
|
| 696 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 697 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 694 | + } else $recent_ident = ''; |
|
| 695 | + $SpotterLive->db=null; |
|
| 696 | + if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 697 | + elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 698 | 698 | } else $recent_ident = ''; |
| 699 | - } else { |
|
| 699 | + } else { |
|
| 700 | 700 | $recent_ident = ''; |
| 701 | 701 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
| 702 | - } |
|
| 703 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 704 | - if($recent_ident == "") |
|
| 705 | - { |
|
| 702 | + } |
|
| 703 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 704 | + if($recent_ident == "") |
|
| 705 | + { |
|
| 706 | 706 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 707 | 707 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 708 | 708 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 709 | 709 | //adds the spotter data for the archive |
| 710 | 710 | $ignoreImport = false; |
| 711 | 711 | foreach($globalAirportIgnore as $airportIgnore) { |
| 712 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 712 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 713 | 713 | $ignoreImport = true; |
| 714 | - } |
|
| 714 | + } |
|
| 715 | 715 | } |
| 716 | 716 | if (count($globalAirportAccept) > 0) { |
| 717 | - $ignoreImport = true; |
|
| 718 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 717 | + $ignoreImport = true; |
|
| 718 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 719 | 719 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 720 | - $ignoreImport = false; |
|
| 720 | + $ignoreImport = false; |
|
| 721 | + } |
|
| 721 | 722 | } |
| 722 | - } |
|
| 723 | 723 | } |
| 724 | 724 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 725 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 725 | + foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 726 | 726 | if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
| 727 | - $ignoreImport = true; |
|
| 727 | + $ignoreImport = true; |
|
| 728 | + } |
|
| 728 | 729 | } |
| 729 | - } |
|
| 730 | 730 | } |
| 731 | 731 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 732 | - $ignoreImport = true; |
|
| 733 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 732 | + $ignoreImport = true; |
|
| 733 | + foreach($globalAirlineAccept as $airlineAccept) { |
|
| 734 | 734 | if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
| 735 | - $ignoreImport = false; |
|
| 735 | + $ignoreImport = false; |
|
| 736 | + } |
|
| 736 | 737 | } |
| 737 | - } |
|
| 738 | 738 | } |
| 739 | 739 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 740 | - $ignoreImport = true; |
|
| 741 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 740 | + $ignoreImport = true; |
|
| 741 | + foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 742 | 742 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 743 | - $ignoreImport = false; |
|
| 743 | + $ignoreImport = false; |
|
| 744 | + } |
|
| 744 | 745 | } |
| 745 | - } |
|
| 746 | 746 | } |
| 747 | 747 | |
| 748 | 748 | if (!$ignoreImport) { |
| 749 | - $highlight = ''; |
|
| 750 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 751 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 752 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 753 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 754 | - $timeelapsed = microtime(true); |
|
| 755 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 749 | + $highlight = ''; |
|
| 750 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 751 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 752 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 753 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 754 | + $timeelapsed = microtime(true); |
|
| 755 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 756 | 756 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 757 | - $Spotter = new Spotter($this->db); |
|
| 758 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 759 | - $Spotter->db = null; |
|
| 760 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 757 | + $Spotter = new Spotter($this->db); |
|
| 758 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 759 | + $Spotter->db = null; |
|
| 760 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 761 | 761 | } |
| 762 | - } |
|
| 763 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 764 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 762 | + } |
|
| 763 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 764 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 765 | 765 | |
| 766 | - // Add source stat in DB |
|
| 767 | - $Stats = new Stats($this->db); |
|
| 768 | - if (!empty($this->stats)) { |
|
| 766 | + // Add source stat in DB |
|
| 767 | + $Stats = new Stats($this->db); |
|
| 768 | + if (!empty($this->stats)) { |
|
| 769 | 769 | if ($globalDebug) echo 'Add source stats : '; |
| 770 | - foreach($this->stats as $date => $data) { |
|
| 771 | - foreach($data as $source => $sourced) { |
|
| 772 | - //print_r($sourced); |
|
| 773 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 774 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 775 | - if (isset($sourced['msg'])) { |
|
| 776 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 777 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 778 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 779 | - unset($this->stats[$date][$source]['msg']); |
|
| 780 | - } |
|
| 781 | - } |
|
| 782 | - } |
|
| 783 | - if ($date != date('Y-m-d')) { |
|
| 784 | - unset($this->stats[$date]); |
|
| 785 | - } |
|
| 786 | - } |
|
| 787 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 788 | - |
|
| 789 | - } |
|
| 790 | - $Stats->db = null; |
|
| 791 | - } |
|
| 792 | - $this->del(); |
|
| 770 | + foreach($this->stats as $date => $data) { |
|
| 771 | + foreach($data as $source => $sourced) { |
|
| 772 | + //print_r($sourced); |
|
| 773 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 774 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 775 | + if (isset($sourced['msg'])) { |
|
| 776 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 777 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 778 | + echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 779 | + unset($this->stats[$date][$source]['msg']); |
|
| 780 | + } |
|
| 781 | + } |
|
| 782 | + } |
|
| 783 | + if ($date != date('Y-m-d')) { |
|
| 784 | + unset($this->stats[$date]); |
|
| 785 | + } |
|
| 786 | + } |
|
| 787 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 788 | + |
|
| 789 | + } |
|
| 790 | + $Stats->db = null; |
|
| 791 | + } |
|
| 792 | + $this->del(); |
|
| 793 | 793 | } elseif ($globalDebug) echo 'Ignore data'."\n"; |
| 794 | 794 | //$ignoreImport = false; |
| 795 | 795 | $this->all_flights[$id]['addedSpotter'] = 1; |
@@ -807,41 +807,41 @@ discard block |
||
| 807 | 807 | */ |
| 808 | 808 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 809 | 809 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 810 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 811 | - //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 812 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 810 | + if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 811 | + //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 812 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 813 | 813 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 814 | - $SpotterLive = new SpotterLive($this->db); |
|
| 815 | - $SpotterLive->deleteLiveSpotterData(); |
|
| 816 | - $SpotterLive->db=null; |
|
| 814 | + $SpotterLive = new SpotterLive($this->db); |
|
| 815 | + $SpotterLive->deleteLiveSpotterData(); |
|
| 816 | + $SpotterLive->db=null; |
|
| 817 | + } |
|
| 817 | 818 | } |
| 818 | - } |
|
| 819 | - if ($globalDebug) echo " Done\n"; |
|
| 820 | - $this->last_delete = time(); |
|
| 819 | + if ($globalDebug) echo " Done\n"; |
|
| 820 | + $this->last_delete = time(); |
|
| 821 | 821 | } |
| 822 | - } else { |
|
| 822 | + } else { |
|
| 823 | 823 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
| 824 | - $this->all_flights[$id]['id'] = $recent_ident; |
|
| 825 | - $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 824 | + $this->all_flights[$id]['id'] = $recent_ident; |
|
| 825 | + $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 826 | 826 | } |
| 827 | 827 | if (isset($globalDaemon) && !$globalDaemon) { |
| 828 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 828 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 829 | 829 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 830 | - $Spotter = new Spotter($this->db); |
|
| 831 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 832 | - $Spotter->db = null; |
|
| 830 | + $Spotter = new Spotter($this->db); |
|
| 831 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 832 | + $Spotter->db = null; |
|
| 833 | + } |
|
| 833 | 834 | } |
| 834 | - } |
|
| 835 | 835 | } |
| 836 | 836 | |
| 837 | - } |
|
| 837 | + } |
|
| 838 | + } |
|
| 838 | 839 | } |
| 839 | - } |
|
| 840 | - //adds the spotter LIVE data |
|
| 841 | - //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 842 | - //echo "\nAdd in Live !! \n"; |
|
| 843 | - //echo "{$line[8]} {$line[7]} - MODES:{$line[4]} CALLSIGN:{$line[10]} ALT:{$line[11]} VEL:{$line[12]} HDG:{$line[13]} LAT:{$line[14]} LON:{$line[15]} VR:{$line[16]} SQUAWK:{$line[17]}\n"; |
|
| 844 | - if ($globalDebug) { |
|
| 840 | + //adds the spotter LIVE data |
|
| 841 | + //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 842 | + //echo "\nAdd in Live !! \n"; |
|
| 843 | + //echo "{$line[8]} {$line[7]} - MODES:{$line[4]} CALLSIGN:{$line[10]} ALT:{$line[11]} VEL:{$line[12]} HDG:{$line[13]} LAT:{$line[14]} LON:{$line[15]} VR:{$line[16]} SQUAWK:{$line[17]}\n"; |
|
| 844 | + if ($globalDebug) { |
|
| 845 | 845 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 846 | 846 | if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n"; |
| 847 | 847 | else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n"; |
@@ -849,60 +849,60 @@ discard block |
||
| 849 | 849 | if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n"; |
| 850 | 850 | else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n"; |
| 851 | 851 | } |
| 852 | - } |
|
| 853 | - $ignoreImport = false; |
|
| 854 | - if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 855 | - if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 852 | + } |
|
| 853 | + $ignoreImport = false; |
|
| 854 | + if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 855 | + if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 856 | 856 | |
| 857 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 858 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 859 | - $ignoreImport = true; |
|
| 857 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 858 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 859 | + $ignoreImport = true; |
|
| 860 | 860 | } |
| 861 | - } |
|
| 862 | - if (count($globalAirportAccept) > 0) { |
|
| 863 | - $ignoreImport = true; |
|
| 864 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 865 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 861 | + } |
|
| 862 | + if (count($globalAirportAccept) > 0) { |
|
| 863 | + $ignoreImport = true; |
|
| 864 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 865 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 866 | 866 | $ignoreImport = false; |
| 867 | - } |
|
| 867 | + } |
|
| 868 | + } |
|
| 868 | 869 | } |
| 869 | - } |
|
| 870 | - if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 870 | + if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 871 | 871 | foreach($globalAirlineIgnore as $airlineIgnore) { |
| 872 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 872 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 873 | 873 | $ignoreImport = true; |
| 874 | - } |
|
| 874 | + } |
|
| 875 | 875 | } |
| 876 | - } |
|
| 877 | - if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 876 | + } |
|
| 877 | + if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 878 | 878 | $ignoreImport = true; |
| 879 | 879 | foreach($globalAirlineAccept as $airlineAccept) { |
| 880 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 880 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 881 | 881 | $ignoreImport = false; |
| 882 | - } |
|
| 882 | + } |
|
| 883 | + } |
|
| 883 | 884 | } |
| 884 | - } |
|
| 885 | - if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 885 | + if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 886 | 886 | $ignoreImport = true; |
| 887 | 887 | foreach($globalPilotIdAccept as $pilotIdAccept) { |
| 888 | - if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 889 | - $ignoreImport = false; |
|
| 890 | - } |
|
| 888 | + if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 889 | + $ignoreImport = false; |
|
| 890 | + } |
|
| 891 | + } |
|
| 891 | 892 | } |
| 892 | - } |
|
| 893 | 893 | |
| 894 | - if (!$ignoreImport) { |
|
| 894 | + if (!$ignoreImport) { |
|
| 895 | 895 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 896 | 896 | if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 897 | 897 | $timeelapsed = microtime(true); |
| 898 | 898 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 899 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 899 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 900 | 900 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 901 | 901 | $SpotterLive = new SpotterLive($this->db); |
| 902 | 902 | $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 903 | 903 | $SpotterLive->db = null; |
| 904 | 904 | if ($globalDebug) echo $result."\n"; |
| 905 | - } |
|
| 905 | + } |
|
| 906 | 906 | } |
| 907 | 907 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 908 | 908 | $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
@@ -914,7 +914,7 @@ discard block |
||
| 914 | 914 | //if ($line['format_source'] != 'aprs') { |
| 915 | 915 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) { |
| 916 | 916 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 917 | - if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 917 | + if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 918 | 918 | $source = $this->all_flights[$id]['source_name']; |
| 919 | 919 | if ($source == '') $source = $this->all_flights[$id]['format_source']; |
| 920 | 920 | if (!isset($this->source_location[$source])) { |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | if ($stats_heading == 16) $stats_heading = 0; |
| 941 | 941 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 942 | 942 | for ($i=0;$i<=15;$i++) { |
| 943 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 943 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 944 | 944 | } |
| 945 | 945 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 946 | 946 | } else { |
@@ -953,17 +953,17 @@ discard block |
||
| 953 | 953 | //var_dump($this->stats); |
| 954 | 954 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 955 | 955 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 956 | - end($this->stats[$current_date][$source]['hist']); |
|
| 957 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 956 | + end($this->stats[$current_date][$source]['hist']); |
|
| 957 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 958 | 958 | } else $mini = 0; |
| 959 | 959 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 960 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 960 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 961 | 961 | } |
| 962 | 962 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 963 | 963 | } else { |
| 964 | 964 | $this->stats[$current_date][$source]['hist'][$distance] += 1; |
| 965 | 965 | } |
| 966 | - } |
|
| 966 | + } |
|
| 967 | 967 | } |
| 968 | 968 | |
| 969 | 969 | $this->all_flights[$id]['lastupdate'] = time(); |
@@ -973,7 +973,7 @@ discard block |
||
| 973 | 973 | //$this->del(); |
| 974 | 974 | |
| 975 | 975 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 976 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 976 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 977 | 977 | if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
| 978 | 978 | $SpotterLive = new SpotterLive($this->db); |
| 979 | 979 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
@@ -981,19 +981,19 @@ discard block |
||
| 981 | 981 | //SpotterLive->deleteLiveSpotterData(); |
| 982 | 982 | if ($globalDebug) echo " Done\n"; |
| 983 | 983 | $this->last_delete_hourly = time(); |
| 984 | - } else { |
|
| 984 | + } else { |
|
| 985 | 985 | $this->del(); |
| 986 | 986 | $this->last_delete_hourly = time(); |
| 987 | - } |
|
| 987 | + } |
|
| 988 | 988 | } |
| 989 | 989 | |
| 990 | - } |
|
| 991 | - //$ignoreImport = false; |
|
| 990 | + } |
|
| 991 | + //$ignoreImport = false; |
|
| 992 | 992 | } |
| 993 | 993 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 994 | 994 | if ($send) return $this->all_flights[$id]; |
| 995 | - } |
|
| 995 | + } |
|
| 996 | + } |
|
| 996 | 997 | } |
| 997 | - } |
|
| 998 | 998 | } |
| 999 | 999 | ?> |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | $currentdate = date('Y-m-d'); |
| 34 | 34 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 35 | 35 | if (!empty($sourcestat)) { |
| 36 | - foreach($sourcestat as $srcst) { |
|
| 36 | + foreach ($sourcestat as $srcst) { |
|
| 37 | 37 | $type = $srcst['stats_type']; |
| 38 | 38 | if ($type == 'polar' || $type == 'hist') { |
| 39 | 39 | $source = $srcst['source_name']; |
| 40 | 40 | $data = $srcst['source_data']; |
| 41 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 41 | + $this->stats[$currentdate][$source][$type] = json_decode($data, true); |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public function get_Schedule($id,$ident) { |
|
| 53 | + public function get_Schedule($id, $ident) { |
|
| 54 | 54 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 55 | 55 | // Get schedule here, so it's done only one time |
| 56 | 56 | |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 76 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | 77 | if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
| 78 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 78 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | 80 | // Should also check if route schedule = route from DB |
| 81 | 81 | if ($schedule['DepartureAirportIATA'] != '') { |
| 82 | 82 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | - $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 99 | + $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']); |
|
| 100 | 100 | } |
| 101 | 101 | } else $scheduleexist = true; |
| 102 | 102 | } else $scheduleexist = true; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | if ($scheduleexist) { |
| 105 | 105 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 106 | 106 | $sch = $Schedule->getSchedule($operator); |
| 107 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
|
| 107 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport' => $sch['arrival_airport_icao'], 'departure_airport' => $sch['departure_airport_icao'], 'departure_airport_time' => $sch['departure_airport_time'], 'arrival_airport_time' => $sch['arrival_airport_time'])); |
|
| 108 | 108 | } |
| 109 | 109 | $Spotter->db = null; |
| 110 | 110 | $Schedule->db = null; |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 132 | 132 | $Spotter = new Spotter($this->db); |
| 133 | 133 | $real_arrival = $this->arrival($key); |
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 134 | + if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $airport_time = ''; |
| 146 | 146 | if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
| 147 | 147 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 148 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist); |
|
| 149 | 149 | if (isset($closestAirports[0])) { |
| 150 | 150 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 151 | 151 | $airport_icao = $closestAirports[0]['icao']; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | break; |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 163 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) { |
|
| 164 | 164 | $airport_icao = $closestAirports[0]['icao']; |
| 165 | 165 | $airport_time = $this->all_flights[$key]['datetime']; |
| 166 | 166 | } else { |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | } else { |
| 174 | 174 | if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
| 175 | 175 | } |
| 176 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 176 | + return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 185 | 185 | foreach ($this->all_flights as $key => $flight) { |
| 186 | 186 | if (isset($flight['lastupdate'])) { |
| 187 | - if ($flight['lastupdate'] < (time()-5900)) { |
|
| 187 | + if ($flight['lastupdate'] < (time() - 5900)) { |
|
| 188 | 188 | $this->delKey($key); |
| 189 | 189 | } |
| 190 | 190 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $real_arrival = $this->arrival($key); |
| 201 | 201 | $Spotter = new Spotter($this->db); |
| 202 | 202 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 203 | - $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 203 | + $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
| 204 | 204 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 205 | 205 | } |
| 206 | 206 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | $send = false; |
| 234 | 234 | |
| 235 | 235 | // SBS format is CSV format |
| 236 | - if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 236 | + if (is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 237 | 237 | //print_r($line); |
| 238 | 238 | if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
| 239 | 239 | if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
@@ -268,25 +268,25 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | if (!isset($this->all_flights[$id])) { |
| 270 | 270 | $this->all_flights[$id] = array(); |
| 271 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 272 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 273 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 271 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 272 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'altitude_previous' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => '')); |
|
| 273 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
| 274 | 274 | if (!isset($line['id'])) { |
| 275 | 275 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 276 | 276 | // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
| 277 | 277 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 278 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 278 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 279 | 279 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 280 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 280 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 281 | 281 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 282 | 282 | } |
| 283 | 283 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 284 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 284 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type'])); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | //print_r($this->all_flights); |
| 288 | 288 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 289 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 289 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex']))); |
|
| 290 | 290 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 291 | 291 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 292 | 292 | //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
@@ -295,27 +295,27 @@ discard block |
||
| 295 | 295 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 296 | 296 | $Spotter = new Spotter($this->db); |
| 297 | 297 | if (isset($this->all_flights[$id]['source_type'])) { |
| 298 | - $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
|
| 298 | + $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']); |
|
| 299 | 299 | } else { |
| 300 | 300 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 301 | 301 | } |
| 302 | 302 | $Spotter->db = null; |
| 303 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 304 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 303 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 304 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 305 | 305 | } |
| 306 | 306 | } |
| 307 | 307 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 308 | 308 | if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
| 309 | 309 | } |
| 310 | 310 | if (isset($line['id']) && !isset($line['hex'])) { |
| 311 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 311 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => '')); |
|
| 312 | 312 | } |
| 313 | 313 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 314 | 314 | $icao = $line['aircraft_icao']; |
| 315 | 315 | $Spotter = new Spotter($this->db); |
| 316 | 316 | if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
| 317 | 317 | $Spotter->db = null; |
| 318 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
|
| 318 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao)); |
|
| 319 | 319 | } |
| 320 | 320 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) { |
| 321 | 321 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | $Spotter = new Spotter($this->db); |
| 324 | 324 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 325 | 325 | $Spotter->db = null; |
| 326 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 326 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 327 | 327 | } |
| 328 | 328 | } |
| 329 | 329 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
@@ -331,15 +331,15 @@ discard block |
||
| 331 | 331 | elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
| 332 | 332 | elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
| 333 | 333 | elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
| 334 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 334 | + if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 335 | 335 | } |
| 336 | 336 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 337 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 337 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA')); |
|
| 338 | 338 | } |
| 339 | 339 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 340 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 340 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 341 | 341 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 342 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
| 342 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
| 343 | 343 | } else { |
| 344 | 344 | if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 345 | 345 | elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
@@ -350,32 +350,32 @@ discard block |
||
| 350 | 350 | */ |
| 351 | 351 | return ''; |
| 352 | 352 | } |
| 353 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 353 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 354 | 354 | if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
| 355 | 355 | return ''; |
| 356 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 356 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 357 | 357 | if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n |
| 358 | 358 | "; |
| 359 | 359 | return ''; |
| 360 | 360 | } elseif (!isset($line['datetime'])) { |
| 361 | 361 | date_default_timezone_set('UTC'); |
| 362 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 362 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 363 | 363 | } else { |
| 364 | 364 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 365 | 365 | return ''; |
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
| 373 | 373 | } |
| 374 | 374 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 375 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 375 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id']))); |
|
| 376 | 376 | } |
| 377 | 377 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 378 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 378 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name']))); |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
@@ -383,13 +383,13 @@ discard block |
||
| 383 | 383 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 384 | 384 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 385 | 385 | if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
| 386 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 387 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 388 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 389 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 390 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 386 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 387 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 388 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 389 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 390 | + elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 391 | 391 | } else { |
| 392 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 392 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 393 | 393 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 394 | 394 | $timeelapsed = microtime(true); |
| 395 | 395 | $Spotter = new Spotter($this->db); |
@@ -399,13 +399,13 @@ discard block |
||
| 399 | 399 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 400 | 400 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 401 | 401 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 402 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 402 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource); |
|
| 403 | 403 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 404 | 404 | $Spotter->db = null; |
| 405 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 405 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 406 | 406 | } |
| 407 | 407 | } |
| 408 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 408 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 409 | 409 | |
| 410 | 410 | /* |
| 411 | 411 | if (!isset($line['id'])) { |
@@ -415,25 +415,25 @@ discard block |
||
| 415 | 415 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 416 | 416 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 417 | 417 | */ |
| 418 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 418 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 419 | 419 | |
| 420 | 420 | //$putinarchive = true; |
| 421 | 421 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
| 422 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 422 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 423 | 423 | } |
| 424 | 424 | if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
| 425 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 425 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 426 | 426 | } |
| 427 | 427 | if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
| 428 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 428 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
| 429 | 429 | } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
| 430 | 430 | $timeelapsed = microtime(true); |
| 431 | 431 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 432 | 432 | $Spotter = new Spotter($this->db); |
| 433 | 433 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 434 | 434 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 435 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 436 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 435 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
| 436 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 437 | 437 | } |
| 438 | 438 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 439 | 439 | $timeelapsed = microtime(true); |
@@ -447,34 +447,34 @@ discard block |
||
| 447 | 447 | $Translation->db = null; |
| 448 | 448 | } |
| 449 | 449 | $Spotter->db = null; |
| 450 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 450 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 451 | 451 | } |
| 452 | 452 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 453 | 453 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
| 454 | 454 | if ($route['fromairport_icao'] != $route['toairport_icao']) { |
| 455 | 455 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop'])); |
| 456 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 456 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop'])); |
|
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | if (!isset($globalFork)) $globalFork = TRUE; |
| 460 | 460 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 461 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 461 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident'])); |
|
| 462 | 462 | } |
| 463 | 463 | } |
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | if (isset($line['speed']) && $line['speed'] != '') { |
| 467 | 467 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 468 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 469 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 468 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
| 469 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
| 470 | 470 | //$dataFound = true; |
| 471 | 471 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 472 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 472 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
| 473 | 473 | if ($distance > 1000 && $distance < 10000) { |
| 474 | 474 | // use datetime |
| 475 | 475 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 476 | 476 | $speed = $speed*3.6; |
| 477 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 477 | + if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
| 478 | 478 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 479 | 479 | } |
| 480 | 480 | } |
@@ -486,11 +486,11 @@ discard block |
||
| 486 | 486 | if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
| 487 | 487 | return false; |
| 488 | 488 | } |
| 489 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 489 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
| 490 | 490 | else unset($timediff); |
| 491 | - if ($this->tmd > 5 || isset($line['format_source']) && $line['format_source'] == 'airwhere' && ((!isset($this->all_flights[$id]['latitude']) || !isset($this->all_flights[$id]['longitude'])) || (isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $this->all_flights[$id]['latitude'] != $line['latitude'] && $this->all_flights[$id]['longitude'] != $line['longitude'])) || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 491 | + if ($this->tmd > 5 || isset($line['format_source']) && $line['format_source'] == 'airwhere' && ((!isset($this->all_flights[$id]['latitude']) || !isset($this->all_flights[$id]['longitude'])) || (isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $this->all_flights[$id]['latitude'] != $line['latitude'] && $this->all_flights[$id]['longitude'] != $line['longitude'])) || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) { |
|
| 492 | 492 | if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) { |
| 493 | - if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || isset($line['format_source']) && $line['format_source'] == 'airwhere' || !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 493 | + if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || isset($line['format_source']) && $line['format_source'] == 'airwhere' || !$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 494 | 494 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 495 | 495 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 496 | 496 | $this->all_flights[$id]['putinarchive'] = true; |
@@ -500,11 +500,11 @@ discard block |
||
| 500 | 500 | $timeelapsed = microtime(true); |
| 501 | 501 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 502 | 502 | $Spotter = new Spotter($this->db); |
| 503 | - $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 503 | + $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 504 | 504 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 505 | 505 | else $this->all_flights[$id]['over_country'] = ''; |
| 506 | 506 | $Spotter->db = null; |
| 507 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 507 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 508 | 508 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 509 | 509 | } |
| 510 | 510 | } |
@@ -514,13 +514,13 @@ discard block |
||
| 514 | 514 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 515 | 515 | //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 516 | 516 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 517 | - if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001) { |
|
| 517 | + if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001) { |
|
| 518 | 518 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 519 | 519 | $dataFound = true; |
| 520 | 520 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 521 | 521 | } |
| 522 | 522 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 523 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
| 523 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
| 524 | 524 | /* |
| 525 | 525 | if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
| 526 | 526 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -538,13 +538,13 @@ discard block |
||
| 538 | 538 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 539 | 539 | //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 540 | 540 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 541 | - if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001) { |
|
| 541 | + if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001) { |
|
| 542 | 542 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 543 | 543 | $dataFound = true; |
| 544 | 544 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 545 | 545 | } |
| 546 | 546 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 547 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
| 547 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
| 548 | 548 | /* |
| 549 | 549 | if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
| 550 | 550 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -562,46 +562,46 @@ discard block |
||
| 562 | 562 | } else if ($globalDebug && $timediff > 30) { |
| 563 | 563 | $this->tmd = $this->tmd + 1; |
| 564 | 564 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 565 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
| 566 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 565 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
| 566 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 567 | 567 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 568 | 568 | } |
| 569 | 569 | } |
| 570 | 570 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 571 | 571 | if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 572 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 572 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update'])); |
|
| 573 | 573 | } |
| 574 | 574 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 575 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 575 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
| 576 | 576 | //$dataFound = true; |
| 577 | 577 | } |
| 578 | 578 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 579 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 579 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
| 580 | 580 | } |
| 581 | 581 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 582 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 582 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
| 583 | 583 | } |
| 584 | 584 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 585 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 585 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
| 586 | 586 | //$dataFound = true; |
| 587 | 587 | } |
| 588 | 588 | if (isset($line['ground']) && $line['ground'] != '') { |
| 589 | 589 | if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
| 590 | 590 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 591 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 592 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 593 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 594 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 595 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 591 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 592 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 593 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 594 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 595 | + elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 596 | 596 | } |
| 597 | 597 | if ($line['ground'] != 1) $line['ground'] = 0; |
| 598 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 598 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
| 599 | 599 | //$dataFound = true; |
| 600 | 600 | } |
| 601 | 601 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 602 | 602 | if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
| 603 | 603 | if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
| 604 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 604 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 605 | 605 | $highlight = ''; |
| 606 | 606 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
| 607 | 607 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
@@ -610,59 +610,59 @@ discard block |
||
| 610 | 610 | $timeelapsed = microtime(true); |
| 611 | 611 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 612 | 612 | $Spotter = new Spotter($this->db); |
| 613 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 613 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
| 614 | 614 | $Spotter->db = null; |
| 615 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 615 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 616 | 616 | } |
| 617 | 617 | //$putinarchive = true; |
| 618 | 618 | //$highlight = ''; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 621 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 622 | 622 | //$dataFound = true; |
| 623 | 623 | } |
| 624 | 624 | |
| 625 | 625 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 626 | 626 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 627 | - if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 628 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
| 629 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
| 627 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 628 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
| 629 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
| 630 | 630 | //$dataFound = true; |
| 631 | 631 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 632 | 632 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
| 633 | 633 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 634 | 634 | if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
| 635 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 636 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 637 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 638 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 639 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 635 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 636 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 637 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 638 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 639 | + elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 640 | 640 | } |
| 641 | 641 | } |
| 642 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 642 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude'])); |
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 646 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 646 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
| 647 | 647 | } |
| 648 | 648 | |
| 649 | 649 | if (isset($line['heading']) && $line['heading'] != '') { |
| 650 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 651 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 652 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 650 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 651 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
| 652 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
| 653 | 653 | //$dataFound = true; |
| 654 | 654 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 655 | - $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 656 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 657 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 655 | + $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 656 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
| 657 | + if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 658 | 658 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
| 659 | 659 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 660 | 660 | // If not enough messages and ACARS set heading to 0 |
| 661 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 661 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
| 662 | 662 | } |
| 663 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 664 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 665 | - elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 663 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 664 | + elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 665 | + elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 666 | 666 | |
| 667 | 667 | // print_r($this->all_flights[$id]); |
| 668 | 668 | //gets the callsign from the last hour |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | if ($dataFound === true && isset($this->all_flights[$id]['id'])) { |
| 674 | 674 | $this->all_flights[$id]['lastupdate'] = time(); |
| 675 | 675 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
| 676 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 676 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 677 | 677 | //print_r($this->all_flights); |
| 678 | 678 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 679 | 679 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
@@ -684,61 +684,61 @@ discard block |
||
| 684 | 684 | $SpotterLive = new SpotterLive($this->db); |
| 685 | 685 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
| 686 | 686 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 687 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 687 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 688 | 688 | } elseif (isset($line['id'])) { |
| 689 | 689 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 690 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 690 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 691 | 691 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 692 | 692 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 693 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 693 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 694 | 694 | } else $recent_ident = ''; |
| 695 | - $SpotterLive->db=null; |
|
| 695 | + $SpotterLive->db = null; |
|
| 696 | 696 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 697 | 697 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 698 | 698 | } else $recent_ident = ''; |
| 699 | 699 | } else { |
| 700 | 700 | $recent_ident = ''; |
| 701 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
| 701 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
| 702 | 702 | } |
| 703 | 703 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 704 | - if($recent_ident == "") |
|
| 704 | + if ($recent_ident == "") |
|
| 705 | 705 | { |
| 706 | 706 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 707 | 707 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 708 | 708 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 709 | 709 | //adds the spotter data for the archive |
| 710 | 710 | $ignoreImport = false; |
| 711 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 711 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 712 | 712 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 713 | 713 | $ignoreImport = true; |
| 714 | 714 | } |
| 715 | 715 | } |
| 716 | 716 | if (count($globalAirportAccept) > 0) { |
| 717 | 717 | $ignoreImport = true; |
| 718 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 718 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 719 | 719 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 720 | 720 | $ignoreImport = false; |
| 721 | 721 | } |
| 722 | 722 | } |
| 723 | 723 | } |
| 724 | 724 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 725 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 726 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 725 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 726 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 727 | 727 | $ignoreImport = true; |
| 728 | 728 | } |
| 729 | 729 | } |
| 730 | 730 | } |
| 731 | 731 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 732 | 732 | $ignoreImport = true; |
| 733 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 734 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 733 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 734 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 735 | 735 | $ignoreImport = false; |
| 736 | 736 | } |
| 737 | 737 | } |
| 738 | 738 | } |
| 739 | 739 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 740 | 740 | $ignoreImport = true; |
| 741 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 741 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 742 | 742 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 743 | 743 | $ignoreImport = false; |
| 744 | 744 | } |
@@ -750,32 +750,32 @@ discard block |
||
| 750 | 750 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
| 751 | 751 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
| 752 | 752 | if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
| 753 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 753 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 754 | 754 | $timeelapsed = microtime(true); |
| 755 | 755 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 756 | 756 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 757 | 757 | $Spotter = new Spotter($this->db); |
| 758 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 758 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['source_type']); |
|
| 759 | 759 | $Spotter->db = null; |
| 760 | 760 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 761 | 761 | } |
| 762 | 762 | } |
| 763 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 763 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 764 | 764 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 765 | 765 | |
| 766 | 766 | // Add source stat in DB |
| 767 | 767 | $Stats = new Stats($this->db); |
| 768 | 768 | if (!empty($this->stats)) { |
| 769 | 769 | if ($globalDebug) echo 'Add source stats : '; |
| 770 | - foreach($this->stats as $date => $data) { |
|
| 771 | - foreach($data as $source => $sourced) { |
|
| 770 | + foreach ($this->stats as $date => $data) { |
|
| 771 | + foreach ($data as $source => $sourced) { |
|
| 772 | 772 | //print_r($sourced); |
| 773 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 774 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 773 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
| 774 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
| 775 | 775 | if (isset($sourced['msg'])) { |
| 776 | 776 | if (time() - $sourced['msg']['date'] > 10) { |
| 777 | 777 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 778 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 778 | + echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
| 779 | 779 | unset($this->stats[$date][$source]['msg']); |
| 780 | 780 | } |
| 781 | 781 | } |
@@ -813,14 +813,14 @@ discard block |
||
| 813 | 813 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 814 | 814 | $SpotterLive = new SpotterLive($this->db); |
| 815 | 815 | $SpotterLive->deleteLiveSpotterData(); |
| 816 | - $SpotterLive->db=null; |
|
| 816 | + $SpotterLive->db = null; |
|
| 817 | 817 | } |
| 818 | 818 | } |
| 819 | 819 | if ($globalDebug) echo " Done\n"; |
| 820 | 820 | $this->last_delete = time(); |
| 821 | 821 | } |
| 822 | 822 | } else { |
| 823 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
|
| 823 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
|
| 824 | 824 | $this->all_flights[$id]['id'] = $recent_ident; |
| 825 | 825 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 826 | 826 | } |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 829 | 829 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 830 | 830 | $Spotter = new Spotter($this->db); |
| 831 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 831 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']); |
|
| 832 | 832 | $Spotter->db = null; |
| 833 | 833 | } |
| 834 | 834 | } |
@@ -854,37 +854,37 @@ discard block |
||
| 854 | 854 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 855 | 855 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 856 | 856 | |
| 857 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 857 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 858 | 858 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 859 | 859 | $ignoreImport = true; |
| 860 | 860 | } |
| 861 | 861 | } |
| 862 | 862 | if (count($globalAirportAccept) > 0) { |
| 863 | 863 | $ignoreImport = true; |
| 864 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 864 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 865 | 865 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 866 | 866 | $ignoreImport = false; |
| 867 | 867 | } |
| 868 | 868 | } |
| 869 | 869 | } |
| 870 | 870 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 871 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 872 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 871 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 872 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 873 | 873 | $ignoreImport = true; |
| 874 | 874 | } |
| 875 | 875 | } |
| 876 | 876 | } |
| 877 | 877 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 878 | 878 | $ignoreImport = true; |
| 879 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 880 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 879 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 880 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 881 | 881 | $ignoreImport = false; |
| 882 | 882 | } |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | 885 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 886 | 886 | $ignoreImport = true; |
| 887 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 887 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 888 | 888 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 889 | 889 | $ignoreImport = false; |
| 890 | 890 | } |
@@ -892,23 +892,23 @@ discard block |
||
| 892 | 892 | } |
| 893 | 893 | |
| 894 | 894 | if (!$ignoreImport) { |
| 895 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 896 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 895 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 896 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 897 | 897 | $timeelapsed = microtime(true); |
| 898 | 898 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 899 | 899 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 900 | 900 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 901 | 901 | $SpotterLive = new SpotterLive($this->db); |
| 902 | - $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 902 | + $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 903 | 903 | $SpotterLive->db = null; |
| 904 | 904 | if ($globalDebug) echo $result."\n"; |
| 905 | 905 | } |
| 906 | 906 | } |
| 907 | 907 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 908 | - $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 908 | + $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 909 | 909 | } |
| 910 | 910 | $this->all_flights[$id]['putinarchive'] = false; |
| 911 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 911 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 912 | 912 | |
| 913 | 913 | // Put statistics in $this->stats variable |
| 914 | 914 | //if ($line['format_source'] != 'aprs') { |
@@ -927,19 +927,19 @@ discard block |
||
| 927 | 927 | $latitude = $globalCenterLatitude; |
| 928 | 928 | $longitude = $globalCenterLongitude; |
| 929 | 929 | } |
| 930 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 930 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 931 | 931 | } else { |
| 932 | 932 | $latitude = $this->source_location[$source]['latitude']; |
| 933 | 933 | $longitude = $this->source_location[$source]['longitude']; |
| 934 | 934 | } |
| 935 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 935 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 936 | 936 | //$stats_heading = $stats_heading%22.5; |
| 937 | 937 | $stats_heading = round($stats_heading/22.5); |
| 938 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 938 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 939 | 939 | $current_date = date('Y-m-d'); |
| 940 | 940 | if ($stats_heading == 16) $stats_heading = 0; |
| 941 | 941 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 942 | - for ($i=0;$i<=15;$i++) { |
|
| 942 | + for ($i = 0; $i <= 15; $i++) { |
|
| 943 | 943 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 944 | 944 | } |
| 945 | 945 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -954,9 +954,9 @@ discard block |
||
| 954 | 954 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 955 | 955 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 956 | 956 | end($this->stats[$current_date][$source]['hist']); |
| 957 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 957 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 958 | 958 | } else $mini = 0; |
| 959 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 959 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 960 | 960 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 961 | 961 | } |
| 962 | 962 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -969,7 +969,7 @@ discard block |
||
| 969 | 969 | $this->all_flights[$id]['lastupdate'] = time(); |
| 970 | 970 | if ($this->all_flights[$id]['putinarchive']) $send = true; |
| 971 | 971 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 972 | - } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 972 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 973 | 973 | //$this->del(); |
| 974 | 974 | |
| 975 | 975 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
@@ -63,7 +63,9 @@ discard block |
||
| 63 | 63 | $dbc = $this->db; |
| 64 | 64 | $this->all_flights[$id]['schedule_check'] = true; |
| 65 | 65 | if ($globalSchedulesFetch) { |
| 66 | - if ($globalDebug) echo 'Getting schedule info...'."\n"; |
|
| 66 | + if ($globalDebug) { |
|
| 67 | + echo 'Getting schedule info...'."\n"; |
|
| 68 | + } |
|
| 67 | 69 | $Spotter = new Spotter($dbc); |
| 68 | 70 | $Schedule = new Schedule($dbc); |
| 69 | 71 | $Translation = new Translation($dbc); |
@@ -74,7 +76,9 @@ discard block |
||
| 74 | 76 | if ($Schedule->checkSchedule($operator) == 0) { |
| 75 | 77 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 78 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 79 | + if ($globalDebug) { |
|
| 80 | + echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 81 | + } |
|
| 78 | 82 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
| 79 | 83 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
| 80 | 84 | // Should also check if route schedule = route from DB |
@@ -83,7 +87,9 @@ discard block |
||
| 83 | 87 | $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
| 84 | 88 | if (trim($airport_icao) != '') { |
| 85 | 89 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 86 | - if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 90 | + if ($globalDebug) { |
|
| 91 | + echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 92 | + } |
|
| 87 | 93 | } |
| 88 | 94 | } |
| 89 | 95 | } |
@@ -92,17 +98,25 @@ discard block |
||
| 92 | 98 | $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
| 93 | 99 | if (trim($airport_icao) != '') { |
| 94 | 100 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 95 | - if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 101 | + if ($globalDebug) { |
|
| 102 | + echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 103 | + } |
|
| 96 | 104 | } |
| 97 | 105 | } |
| 98 | 106 | } |
| 99 | 107 | $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
| 100 | 108 | } |
| 101 | - } else $scheduleexist = true; |
|
| 102 | - } else $scheduleexist = true; |
|
| 109 | + } else { |
|
| 110 | + $scheduleexist = true; |
|
| 111 | + } |
|
| 112 | + } else { |
|
| 113 | + $scheduleexist = true; |
|
| 114 | + } |
|
| 103 | 115 | // close connection, at least one way will work ? |
| 104 | 116 | if ($scheduleexist) { |
| 105 | - if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 117 | + if ($globalDebug) { |
|
| 118 | + echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 119 | + } |
|
| 106 | 120 | $sch = $Schedule->getSchedule($operator); |
| 107 | 121 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
| 108 | 122 | } |
@@ -124,14 +138,18 @@ discard block |
||
| 124 | 138 | |
| 125 | 139 | public function checkAll() { |
| 126 | 140 | global $globalDebug, $globalNoImport; |
| 127 | - if ($globalDebug) echo "Update last seen flights data...\n"; |
|
| 141 | + if ($globalDebug) { |
|
| 142 | + echo "Update last seen flights data...\n"; |
|
| 143 | + } |
|
| 128 | 144 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 129 | 145 | foreach ($this->all_flights as $key => $flight) { |
| 130 | 146 | if (isset($this->all_flights[$key]['id'])) { |
| 131 | 147 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 132 | 148 | $Spotter = new Spotter($this->db); |
| 133 | 149 | $real_arrival = $this->arrival($key); |
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 150 | + if (isset($this->all_flights[$key]['altitude'])) { |
|
| 151 | + $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 152 | + } |
|
| 135 | 153 | } |
| 136 | 154 | } |
| 137 | 155 | } |
@@ -139,24 +157,32 @@ discard block |
||
| 139 | 157 | |
| 140 | 158 | public function arrival($key) { |
| 141 | 159 | global $globalClosestMinDist, $globalDebug; |
| 142 | - if ($globalDebug) echo 'Update arrival...'."\n"; |
|
| 160 | + if ($globalDebug) { |
|
| 161 | + echo 'Update arrival...'."\n"; |
|
| 162 | + } |
|
| 143 | 163 | $Spotter = new Spotter($this->db); |
| 144 | 164 | $airport_icao = ''; |
| 145 | 165 | $airport_time = ''; |
| 146 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 166 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') { |
|
| 167 | + $globalClosestMinDist = 50; |
|
| 168 | + } |
|
| 147 | 169 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | 170 | $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
| 149 | 171 | if (isset($closestAirports[0])) { |
| 150 | 172 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 151 | 173 | $airport_icao = $closestAirports[0]['icao']; |
| 152 | 174 | $airport_time = $this->all_flights[$key]['datetime']; |
| 153 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 175 | + if ($globalDebug) { |
|
| 176 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 177 | + } |
|
| 154 | 178 | } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
| 155 | 179 | foreach ($closestAirports as $airport) { |
| 156 | 180 | if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
| 157 | 181 | $airport_icao = $airport['icao']; |
| 158 | 182 | $airport_time = $this->all_flights[$key]['datetime']; |
| 159 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 183 | + if ($globalDebug) { |
|
| 184 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 185 | + } |
|
| 160 | 186 | break; |
| 161 | 187 | } |
| 162 | 188 | } |
@@ -164,14 +190,20 @@ discard block |
||
| 164 | 190 | $airport_icao = $closestAirports[0]['icao']; |
| 165 | 191 | $airport_time = $this->all_flights[$key]['datetime']; |
| 166 | 192 | } else { |
| 167 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 193 | + if ($globalDebug) { |
|
| 194 | + echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 195 | + } |
|
| 168 | 196 | } |
| 169 | 197 | } else { |
| 170 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 198 | + if ($globalDebug) { |
|
| 199 | + echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 200 | + } |
|
| 171 | 201 | } |
| 172 | 202 | |
| 173 | 203 | } else { |
| 174 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 204 | + if ($globalDebug) { |
|
| 205 | + echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 206 | + } |
|
| 175 | 207 | } |
| 176 | 208 | return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
| 177 | 209 | } |
@@ -181,7 +213,9 @@ discard block |
||
| 181 | 213 | public function del() { |
| 182 | 214 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 183 | 215 | // Delete old infos |
| 184 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 216 | + if ($globalDebug) { |
|
| 217 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 218 | + } |
|
| 185 | 219 | foreach ($this->all_flights as $key => $flight) { |
| 186 | 220 | if (isset($flight['lastupdate'])) { |
| 187 | 221 | if ($flight['lastupdate'] < (time()-5900)) { |
@@ -195,13 +229,17 @@ discard block |
||
| 195 | 229 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 196 | 230 | // Delete old infos |
| 197 | 231 | if (isset($this->all_flights[$key]['id'])) { |
| 198 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 232 | + if ($globalDebug) { |
|
| 233 | + echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 234 | + } |
|
| 199 | 235 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 200 | 236 | $real_arrival = $this->arrival($key); |
| 201 | 237 | $Spotter = new Spotter($this->db); |
| 202 | 238 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 203 | 239 | $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
| 204 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 240 | + if ($globalDebug && $result != 'success') { |
|
| 241 | + echo '!!! ERROR : '.$result."\n"; |
|
| 242 | + } |
|
| 205 | 243 | } |
| 206 | 244 | } |
| 207 | 245 | } |
@@ -211,9 +249,13 @@ discard block |
||
| 211 | 249 | public function add($line) { |
| 212 | 250 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate; |
| 213 | 251 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 214 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
| 215 | - if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') $globalAircraftMaxUpdate = 2300; |
|
| 216 | -/* |
|
| 252 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 253 | + $globalCoordMinChange = '0.02'; |
|
| 254 | + } |
|
| 255 | + if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') { |
|
| 256 | + $globalAircraftMaxUpdate = 2300; |
|
| 257 | + } |
|
| 258 | + /* |
|
| 217 | 259 | $Spotter = new Spotter(); |
| 218 | 260 | $dbc = $Spotter->db; |
| 219 | 261 | $SpotterLive = new SpotterLive($dbc); |
@@ -235,19 +277,28 @@ discard block |
||
| 235 | 277 | // SBS format is CSV format |
| 236 | 278 | if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
| 237 | 279 | //print_r($line); |
| 238 | - if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 280 | + if (isset($line['hex'])) { |
|
| 281 | + $line['hex'] = strtoupper($line['hex']); |
|
| 282 | + } |
|
| 239 | 283 | if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
| 240 | 284 | |
| 241 | 285 | // Increment message number |
| 242 | 286 | if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) { |
| 243 | 287 | $current_date = date('Y-m-d'); |
| 244 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 245 | - else $source = ''; |
|
| 246 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 288 | + if (isset($line['source_name'])) { |
|
| 289 | + $source = $line['source_name']; |
|
| 290 | + } else { |
|
| 291 | + $source = ''; |
|
| 292 | + } |
|
| 293 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 294 | + $source = $line['format_source']; |
|
| 295 | + } |
|
| 247 | 296 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 248 | 297 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 249 | 298 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 250 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 299 | + } else { |
|
| 300 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 301 | + } |
|
| 251 | 302 | } |
| 252 | 303 | |
| 253 | 304 | /* |
@@ -263,22 +314,35 @@ discard block |
||
| 263 | 314 | //$this->db = $dbc; |
| 264 | 315 | |
| 265 | 316 | //$hex = trim($line['hex']); |
| 266 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 267 | - else $id = trim($line['id']); |
|
| 317 | + if (!isset($line['id'])) { |
|
| 318 | + $id = trim($line['hex']); |
|
| 319 | + } else { |
|
| 320 | + $id = trim($line['id']); |
|
| 321 | + } |
|
| 268 | 322 | |
| 269 | 323 | if (!isset($this->all_flights[$id])) { |
| 270 | 324 | $this->all_flights[$id] = array(); |
| 271 | 325 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 272 | 326 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
| 273 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 327 | + if (isset($globalDaemon) && $globalDaemon === FALSE) { |
|
| 328 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 329 | + } |
|
| 274 | 330 | if (!isset($line['id'])) { |
| 275 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 276 | -// if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
|
| 331 | + if (!isset($globalDaemon)) { |
|
| 332 | + $globalDaemon = TRUE; |
|
| 333 | + } |
|
| 334 | + // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
|
| 277 | 335 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 278 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 336 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 337 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 338 | + } |
|
| 279 | 339 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 280 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 281 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 340 | + } else { |
|
| 341 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 342 | + } |
|
| 343 | + if ($globalAllFlights !== FALSE) { |
|
| 344 | + $dataFound = true; |
|
| 345 | + } |
|
| 282 | 346 | } |
| 283 | 347 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 284 | 348 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
@@ -300,12 +364,20 @@ discard block |
||
| 300 | 364 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 301 | 365 | } |
| 302 | 366 | $Spotter->db = null; |
| 303 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 304 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 367 | + if ($globalDebugTimeElapsed) { |
|
| 368 | + echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 369 | + } |
|
| 370 | + if ($aircraft_icao != '') { |
|
| 371 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 372 | + } |
|
| 305 | 373 | } |
| 306 | 374 | } |
| 307 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 308 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 375 | + if ($globalAllFlights !== FALSE) { |
|
| 376 | + $dataFound = true; |
|
| 377 | + } |
|
| 378 | + if ($globalDebug) { |
|
| 379 | + echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 380 | + } |
|
| 309 | 381 | } |
| 310 | 382 | if (isset($line['id']) && !isset($line['hex'])) { |
| 311 | 383 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
@@ -313,7 +385,9 @@ discard block |
||
| 313 | 385 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 314 | 386 | $icao = $line['aircraft_icao']; |
| 315 | 387 | $Spotter = new Spotter($this->db); |
| 316 | - if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 388 | + if (isset($Spotter->aircraft_correct_icaotype[$icao])) { |
|
| 389 | + $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 390 | + } |
|
| 317 | 391 | $Spotter->db = null; |
| 318 | 392 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
| 319 | 393 | } |
@@ -323,15 +397,24 @@ discard block |
||
| 323 | 397 | $Spotter = new Spotter($this->db); |
| 324 | 398 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 325 | 399 | $Spotter->db = null; |
| 326 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 400 | + if ($aircraft_icao != '') { |
|
| 401 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 402 | + } |
|
| 327 | 403 | } |
| 328 | 404 | } |
| 329 | 405 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
| 330 | - if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
|
| 331 | - elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
| 332 | - elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
| 333 | - elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
| 334 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 406 | + if ($line['aircraft_type'] == 'PARA_GLIDER') { |
|
| 407 | + $aircraft_icao = 'GLID'; |
|
| 408 | + } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') { |
|
| 409 | + $aircraft_icao = 'UHEL'; |
|
| 410 | + } elseif ($line['aircraft_type'] == 'TOW_PLANE') { |
|
| 411 | + $aircraft_icao = 'TOWPLANE'; |
|
| 412 | + } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') { |
|
| 413 | + $aircraft_icao = 'POWAIRC'; |
|
| 414 | + } |
|
| 415 | + if (isset($aircraft_icao)) { |
|
| 416 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 417 | + } |
|
| 335 | 418 | } |
| 336 | 419 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 337 | 420 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
@@ -341,8 +424,11 @@ discard block |
||
| 341 | 424 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 342 | 425 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 343 | 426 | } else { |
| 344 | - if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 345 | - elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 427 | + if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 428 | + echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 429 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 430 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 431 | + } |
|
| 346 | 432 | /* |
| 347 | 433 | echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']); |
| 348 | 434 | print_r($this->all_flights[$id]); |
@@ -351,17 +437,23 @@ discard block |
||
| 351 | 437 | return ''; |
| 352 | 438 | } |
| 353 | 439 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 354 | - if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
|
| 440 | + if ($globalDebug) { |
|
| 441 | + echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
|
| 442 | + } |
|
| 355 | 443 | return ''; |
| 356 | 444 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 357 | - if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n |
|
| 445 | + if ($globalDebug) { |
|
| 446 | + echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n |
|
| 358 | 447 | "; |
| 448 | + } |
|
| 359 | 449 | return ''; |
| 360 | 450 | } elseif (!isset($line['datetime'])) { |
| 361 | 451 | date_default_timezone_set('UTC'); |
| 362 | 452 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 363 | 453 | } else { |
| 364 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 454 | + if ($globalDebug) { |
|
| 455 | + echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 456 | + } |
|
| 365 | 457 | return ''; |
| 366 | 458 | } |
| 367 | 459 | |
@@ -382,30 +474,48 @@ discard block |
||
| 382 | 474 | |
| 383 | 475 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 384 | 476 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 385 | - if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
| 477 | + if ($globalDebug) { |
|
| 478 | + echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
| 479 | + } |
|
| 386 | 480 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 387 | 481 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 388 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 389 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 390 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 482 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 483 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 484 | + } elseif (isset($line['id'])) { |
|
| 485 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 486 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 487 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 488 | + } |
|
| 391 | 489 | } else { |
| 392 | 490 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
| 393 | 491 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 394 | 492 | $timeelapsed = microtime(true); |
| 395 | 493 | $Spotter = new Spotter($this->db); |
| 396 | 494 | $fromsource = NULL; |
| 397 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 398 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 399 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 400 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 401 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 495 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 496 | + $fromsource = $globalAirlinesSource; |
|
| 497 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') { |
|
| 498 | + $fromsource = 'vatsim'; |
|
| 499 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') { |
|
| 500 | + $fromsource = 'ivao'; |
|
| 501 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 502 | + $fromsource = 'vatsim'; |
|
| 503 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 504 | + $fromsource = 'ivao'; |
|
| 505 | + } |
|
| 402 | 506 | $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
| 403 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 507 | + if ($globalDebug && $result != 'success') { |
|
| 508 | + echo '!!! ERROR : '.$result."\n"; |
|
| 509 | + } |
|
| 404 | 510 | $Spotter->db = null; |
| 405 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 511 | + if ($globalDebugTimeElapsed) { |
|
| 512 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 513 | + } |
|
| 406 | 514 | } |
| 407 | 515 | } |
| 408 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 516 | + } else { |
|
| 517 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 518 | + } |
|
| 409 | 519 | |
| 410 | 520 | /* |
| 411 | 521 | if (!isset($line['id'])) { |
@@ -415,7 +525,9 @@ discard block |
||
| 415 | 525 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 416 | 526 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 417 | 527 | */ |
| 418 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 528 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 529 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 530 | + } |
|
| 419 | 531 | |
| 420 | 532 | //$putinarchive = true; |
| 421 | 533 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
@@ -433,7 +545,9 @@ discard block |
||
| 433 | 545 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 434 | 546 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 435 | 547 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
| 436 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 548 | + if ($globalDebugTimeElapsed) { |
|
| 549 | + echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 550 | + } |
|
| 437 | 551 | } |
| 438 | 552 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 439 | 553 | $timeelapsed = microtime(true); |
@@ -447,7 +561,9 @@ discard block |
||
| 447 | 561 | $Translation->db = null; |
| 448 | 562 | } |
| 449 | 563 | $Spotter->db = null; |
| 450 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 564 | + if ($globalDebugTimeElapsed) { |
|
| 565 | + echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 566 | + } |
|
| 451 | 567 | } |
| 452 | 568 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 453 | 569 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
@@ -456,9 +572,13 @@ discard block |
||
| 456 | 572 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
| 457 | 573 | } |
| 458 | 574 | } |
| 459 | - if (!isset($globalFork)) $globalFork = TRUE; |
|
| 575 | + if (!isset($globalFork)) { |
|
| 576 | + $globalFork = TRUE; |
|
| 577 | + } |
|
| 460 | 578 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 461 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 579 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) { |
|
| 580 | + $this->get_Schedule($id,trim($line['ident'])); |
|
| 581 | + } |
|
| 462 | 582 | } |
| 463 | 583 | } |
| 464 | 584 | } |
@@ -474,8 +594,12 @@ discard block |
||
| 474 | 594 | // use datetime |
| 475 | 595 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 476 | 596 | $speed = $speed*3.6; |
| 477 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 478 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 597 | + if ($speed < 1000) { |
|
| 598 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 599 | + } |
|
| 600 | + if ($globalDebug) { |
|
| 601 | + echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 602 | + } |
|
| 479 | 603 | } |
| 480 | 604 | } |
| 481 | 605 | |
@@ -483,11 +607,16 @@ discard block |
||
| 483 | 607 | |
| 484 | 608 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
| 485 | 609 | if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
| 486 | - if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 610 | + if ($globalDebug) { |
|
| 611 | + echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 612 | + } |
|
| 487 | 613 | return false; |
| 488 | 614 | } |
| 489 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 490 | - else unset($timediff); |
|
| 615 | + if (isset($this->all_flights[$id]['time_last_coord'])) { |
|
| 616 | + $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 617 | + } else { |
|
| 618 | + unset($timediff); |
|
| 619 | + } |
|
| 491 | 620 | if ($this->tmd > 5 || isset($line['format_source']) && $line['format_source'] == 'airwhere' && ((!isset($this->all_flights[$id]['latitude']) || !isset($this->all_flights[$id]['longitude'])) || (isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $this->all_flights[$id]['latitude'] != $line['latitude'] && $this->all_flights[$id]['longitude'] != $line['longitude'])) || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
| 492 | 621 | if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) { |
| 493 | 622 | if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || isset($line['format_source']) && $line['format_source'] == 'airwhere' || !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
@@ -496,16 +625,25 @@ discard block |
||
| 496 | 625 | $this->all_flights[$id]['putinarchive'] = true; |
| 497 | 626 | $this->tmd = 0; |
| 498 | 627 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 499 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 628 | + if ($globalDebug) { |
|
| 629 | + echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 630 | + } |
|
| 500 | 631 | $timeelapsed = microtime(true); |
| 501 | 632 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 502 | 633 | $Spotter = new Spotter($this->db); |
| 503 | 634 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 504 | - if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 505 | - else $this->all_flights[$id]['over_country'] = ''; |
|
| 635 | + if (!empty($all_country)) { |
|
| 636 | + $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 637 | + } else { |
|
| 638 | + $this->all_flights[$id]['over_country'] = ''; |
|
| 639 | + } |
|
| 506 | 640 | $Spotter->db = null; |
| 507 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 508 | - if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 641 | + if ($globalDebugTimeElapsed) { |
|
| 642 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 643 | + } |
|
| 644 | + if ($globalDebug) { |
|
| 645 | + echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 646 | + } |
|
| 509 | 647 | } |
| 510 | 648 | } |
| 511 | 649 | } |
@@ -513,7 +651,9 @@ discard block |
||
| 513 | 651 | |
| 514 | 652 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 515 | 653 | //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 516 | - if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 654 | + if (!isset($this->all_flights[$id]['archive_latitude'])) { |
|
| 655 | + $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 656 | + } |
|
| 517 | 657 | if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001) { |
| 518 | 658 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 519 | 659 | $dataFound = true; |
@@ -535,9 +675,13 @@ discard block |
||
| 535 | 675 | */ |
| 536 | 676 | } |
| 537 | 677 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 538 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 678 | + if ($line['longitude'] > 180) { |
|
| 679 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 680 | + } |
|
| 539 | 681 | //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 540 | - if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 682 | + if (!isset($this->all_flights[$id]['archive_longitude'])) { |
|
| 683 | + $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 684 | + } |
|
| 541 | 685 | if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001) { |
| 542 | 686 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 543 | 687 | $dataFound = true; |
@@ -568,7 +712,9 @@ discard block |
||
| 568 | 712 | } |
| 569 | 713 | } |
| 570 | 714 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 571 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 715 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) { |
|
| 716 | + $dataFound = true; |
|
| 717 | + } |
|
| 572 | 718 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
| 573 | 719 | } |
| 574 | 720 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
@@ -590,53 +736,79 @@ discard block |
||
| 590 | 736 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 591 | 737 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 592 | 738 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 593 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 594 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 595 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 739 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 740 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 741 | + } elseif (isset($line['id'])) { |
|
| 742 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 743 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 744 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 745 | + } |
|
| 746 | + } |
|
| 747 | + if ($line['ground'] != 1) { |
|
| 748 | + $line['ground'] = 0; |
|
| 596 | 749 | } |
| 597 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 598 | 750 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
| 599 | 751 | //$dataFound = true; |
| 600 | 752 | } |
| 601 | 753 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 602 | 754 | if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
| 603 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 755 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) { |
|
| 756 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 757 | + } |
|
| 604 | 758 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
| 605 | 759 | $highlight = ''; |
| 606 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 607 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 608 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 760 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 761 | + $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 762 | + } |
|
| 763 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 764 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 765 | + } |
|
| 766 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 767 | + $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 768 | + } |
|
| 609 | 769 | if ($highlight != '') { |
| 610 | 770 | $timeelapsed = microtime(true); |
| 611 | 771 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 612 | 772 | $Spotter = new Spotter($this->db); |
| 613 | 773 | $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
| 614 | 774 | $Spotter->db = null; |
| 615 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 775 | + if ($globalDebugTimeElapsed) { |
|
| 776 | + echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 777 | + } |
|
| 616 | 778 | } |
| 617 | 779 | //$putinarchive = true; |
| 618 | 780 | //$highlight = ''; |
| 619 | 781 | } |
| 620 | 782 | |
| 621 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 783 | + } else { |
|
| 784 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 785 | + } |
|
| 622 | 786 | //$dataFound = true; |
| 623 | 787 | } |
| 624 | 788 | |
| 625 | 789 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 626 | 790 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 627 | - if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 791 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) { |
|
| 792 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 793 | + } |
|
| 628 | 794 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 629 | 795 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 630 | 796 | //$dataFound = true; |
| 631 | 797 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 632 | 798 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
| 633 | 799 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 634 | - if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
|
| 800 | + if ($globalDebug) { |
|
| 801 | + echo '--- Reset because of altitude'."\n"; |
|
| 802 | + } |
|
| 635 | 803 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 636 | 804 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 637 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 638 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 639 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 805 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 806 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 807 | + } elseif (isset($line['id'])) { |
|
| 808 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 809 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 810 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 811 | + } |
|
| 640 | 812 | } |
| 641 | 813 | } |
| 642 | 814 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
@@ -647,22 +819,32 @@ discard block |
||
| 647 | 819 | } |
| 648 | 820 | |
| 649 | 821 | if (isset($line['heading']) && $line['heading'] != '') { |
| 650 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 822 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) { |
|
| 823 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 824 | + } |
|
| 651 | 825 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
| 652 | 826 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
| 653 | 827 | //$dataFound = true; |
| 654 | 828 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 655 | 829 | $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
| 656 | 830 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
| 657 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 658 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 831 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) { |
|
| 832 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 833 | + } |
|
| 834 | + if ($globalDebug) { |
|
| 835 | + echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 836 | + } |
|
| 659 | 837 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 660 | 838 | // If not enough messages and ACARS set heading to 0 |
| 661 | 839 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
| 662 | 840 | } |
| 663 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 664 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 665 | - elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 841 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) { |
|
| 842 | + $dataFound = false; |
|
| 843 | + } elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) { |
|
| 844 | + $dataFound = false; |
|
| 845 | + } elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) { |
|
| 846 | + $dataFound = false; |
|
| 847 | + } |
|
| 666 | 848 | |
| 667 | 849 | // print_r($this->all_flights[$id]); |
| 668 | 850 | //gets the callsign from the last hour |
@@ -679,23 +861,38 @@ discard block |
||
| 679 | 861 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
| 680 | 862 | if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
| 681 | 863 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 682 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 864 | + if ($globalDebug) { |
|
| 865 | + echo "Check if aircraft is already in DB..."; |
|
| 866 | + } |
|
| 683 | 867 | $timeelapsed = microtime(true); |
| 684 | 868 | $SpotterLive = new SpotterLive($this->db); |
| 685 | 869 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
| 686 | 870 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 687 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 871 | + if ($globalDebugTimeElapsed) { |
|
| 872 | + echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 873 | + } |
|
| 688 | 874 | } elseif (isset($line['id'])) { |
| 689 | 875 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 690 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 876 | + if ($globalDebugTimeElapsed) { |
|
| 877 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 878 | + } |
|
| 691 | 879 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 692 | 880 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 693 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 694 | - } else $recent_ident = ''; |
|
| 881 | + if ($globalDebugTimeElapsed) { |
|
| 882 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 883 | + } |
|
| 884 | + } else { |
|
| 885 | + $recent_ident = ''; |
|
| 886 | + } |
|
| 695 | 887 | $SpotterLive->db=null; |
| 696 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 697 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 698 | - } else $recent_ident = ''; |
|
| 888 | + if ($globalDebug && $recent_ident == '') { |
|
| 889 | + echo " Not in DB.\n"; |
|
| 890 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 891 | + echo " Already in DB.\n"; |
|
| 892 | + } |
|
| 893 | + } else { |
|
| 894 | + $recent_ident = ''; |
|
| 895 | + } |
|
| 699 | 896 | } else { |
| 700 | 897 | $recent_ident = ''; |
| 701 | 898 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
@@ -703,7 +900,9 @@ discard block |
||
| 703 | 900 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 704 | 901 | if($recent_ident == "") |
| 705 | 902 | { |
| 706 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 903 | + if ($globalDebug) { |
|
| 904 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 905 | + } |
|
| 707 | 906 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 708 | 907 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 709 | 908 | //adds the spotter data for the archive |
@@ -747,31 +946,49 @@ discard block |
||
| 747 | 946 | |
| 748 | 947 | if (!$ignoreImport) { |
| 749 | 948 | $highlight = ''; |
| 750 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 751 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 752 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 753 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 949 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 950 | + $highlight = 'Squawk 7500 : Hijack'; |
|
| 951 | + } |
|
| 952 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 953 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 954 | + } |
|
| 955 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 956 | + $highlight = 'Squawk 7700 : Emergency'; |
|
| 957 | + } |
|
| 958 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 959 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 960 | + } |
|
| 754 | 961 | $timeelapsed = microtime(true); |
| 755 | 962 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 756 | 963 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 757 | 964 | $Spotter = new Spotter($this->db); |
| 758 | 965 | $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
| 759 | 966 | $Spotter->db = null; |
| 760 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 967 | + if ($globalDebug && isset($result)) { |
|
| 968 | + echo $result."\n"; |
|
| 969 | + } |
|
| 761 | 970 | } |
| 762 | 971 | } |
| 763 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 972 | + if ($globalDebugTimeElapsed) { |
|
| 973 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 974 | + } |
|
| 764 | 975 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 765 | 976 | |
| 766 | 977 | // Add source stat in DB |
| 767 | 978 | $Stats = new Stats($this->db); |
| 768 | 979 | if (!empty($this->stats)) { |
| 769 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 980 | + if ($globalDebug) { |
|
| 981 | + echo 'Add source stats : '; |
|
| 982 | + } |
|
| 770 | 983 | foreach($this->stats as $date => $data) { |
| 771 | 984 | foreach($data as $source => $sourced) { |
| 772 | 985 | //print_r($sourced); |
| 773 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 774 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 986 | + if (isset($sourced['polar'])) { |
|
| 987 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 988 | + } |
|
| 989 | + if (isset($sourced['hist'])) { |
|
| 990 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 991 | + } |
|
| 775 | 992 | if (isset($sourced['msg'])) { |
| 776 | 993 | if (time() - $sourced['msg']['date'] > 10) { |
| 777 | 994 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -784,13 +1001,17 @@ discard block |
||
| 784 | 1001 | unset($this->stats[$date]); |
| 785 | 1002 | } |
| 786 | 1003 | } |
| 787 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 1004 | + if ($globalDebug) { |
|
| 1005 | + echo 'Done'."\n"; |
|
| 1006 | + } |
|
| 788 | 1007 | |
| 789 | 1008 | } |
| 790 | 1009 | $Stats->db = null; |
| 791 | 1010 | } |
| 792 | 1011 | $this->del(); |
| 793 | - } elseif ($globalDebug) echo 'Ignore data'."\n"; |
|
| 1012 | + } elseif ($globalDebug) { |
|
| 1013 | + echo 'Ignore data'."\n"; |
|
| 1014 | + } |
|
| 794 | 1015 | //$ignoreImport = false; |
| 795 | 1016 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 796 | 1017 | //print_r($this->all_flights[$id]); |
@@ -807,7 +1028,9 @@ discard block |
||
| 807 | 1028 | */ |
| 808 | 1029 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 809 | 1030 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 810 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 1031 | + if ($globalDebug) { |
|
| 1032 | + echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 1033 | + } |
|
| 811 | 1034 | //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 812 | 1035 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 813 | 1036 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -816,7 +1039,9 @@ discard block |
||
| 816 | 1039 | $SpotterLive->db=null; |
| 817 | 1040 | } |
| 818 | 1041 | } |
| 819 | - if ($globalDebug) echo " Done\n"; |
|
| 1042 | + if ($globalDebug) { |
|
| 1043 | + echo " Done\n"; |
|
| 1044 | + } |
|
| 820 | 1045 | $this->last_delete = time(); |
| 821 | 1046 | } |
| 822 | 1047 | } else { |
@@ -843,11 +1068,17 @@ discard block |
||
| 843 | 1068 | //echo "{$line[8]} {$line[7]} - MODES:{$line[4]} CALLSIGN:{$line[10]} ALT:{$line[11]} VEL:{$line[12]} HDG:{$line[13]} LAT:{$line[14]} LON:{$line[15]} VR:{$line[16]} SQUAWK:{$line[17]}\n"; |
| 844 | 1069 | if ($globalDebug) { |
| 845 | 1070 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 846 | - if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n"; |
|
| 847 | - else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n"; |
|
| 1071 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1072 | + echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n"; |
|
| 1073 | + } else { |
|
| 1074 | + echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n"; |
|
| 1075 | + } |
|
| 848 | 1076 | } else { |
| 849 | - if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n"; |
|
| 850 | - else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n"; |
|
| 1077 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1078 | + echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n"; |
|
| 1079 | + } else { |
|
| 1080 | + echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n"; |
|
| 1081 | + } |
|
| 851 | 1082 | } |
| 852 | 1083 | } |
| 853 | 1084 | $ignoreImport = false; |
@@ -893,22 +1124,30 @@ discard block |
||
| 893 | 1124 | |
| 894 | 1125 | if (!$ignoreImport) { |
| 895 | 1126 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 896 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 1127 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 1128 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 1129 | + } |
|
| 897 | 1130 | $timeelapsed = microtime(true); |
| 898 | 1131 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 899 | 1132 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 900 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1133 | + if ($globalDebug) { |
|
| 1134 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1135 | + } |
|
| 901 | 1136 | $SpotterLive = new SpotterLive($this->db); |
| 902 | 1137 | $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 903 | 1138 | $SpotterLive->db = null; |
| 904 | - if ($globalDebug) echo $result."\n"; |
|
| 1139 | + if ($globalDebug) { |
|
| 1140 | + echo $result."\n"; |
|
| 1141 | + } |
|
| 905 | 1142 | } |
| 906 | 1143 | } |
| 907 | 1144 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 908 | 1145 | $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 909 | 1146 | } |
| 910 | 1147 | $this->all_flights[$id]['putinarchive'] = false; |
| 911 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1148 | + if ($globalDebugTimeElapsed) { |
|
| 1149 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1150 | + } |
|
| 912 | 1151 | |
| 913 | 1152 | // Put statistics in $this->stats variable |
| 914 | 1153 | //if ($line['format_source'] != 'aprs') { |
@@ -916,7 +1155,9 @@ discard block |
||
| 916 | 1155 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 917 | 1156 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 918 | 1157 | $source = $this->all_flights[$id]['source_name']; |
| 919 | - if ($source == '') $source = $this->all_flights[$id]['format_source']; |
|
| 1158 | + if ($source == '') { |
|
| 1159 | + $source = $this->all_flights[$id]['format_source']; |
|
| 1160 | + } |
|
| 920 | 1161 | if (!isset($this->source_location[$source])) { |
| 921 | 1162 | $Location = new Source(); |
| 922 | 1163 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -937,7 +1178,9 @@ discard block |
||
| 937 | 1178 | $stats_heading = round($stats_heading/22.5); |
| 938 | 1179 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
| 939 | 1180 | $current_date = date('Y-m-d'); |
| 940 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 1181 | + if ($stats_heading == 16) { |
|
| 1182 | + $stats_heading = 0; |
|
| 1183 | + } |
|
| 941 | 1184 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 942 | 1185 | for ($i=0;$i<=15;$i++) { |
| 943 | 1186 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -955,7 +1198,9 @@ discard block |
||
| 955 | 1198 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 956 | 1199 | end($this->stats[$current_date][$source]['hist']); |
| 957 | 1200 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 958 | - } else $mini = 0; |
|
| 1201 | + } else { |
|
| 1202 | + $mini = 0; |
|
| 1203 | + } |
|
| 959 | 1204 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 960 | 1205 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 961 | 1206 | } |
@@ -967,19 +1212,27 @@ discard block |
||
| 967 | 1212 | } |
| 968 | 1213 | |
| 969 | 1214 | $this->all_flights[$id]['lastupdate'] = time(); |
| 970 | - if ($this->all_flights[$id]['putinarchive']) $send = true; |
|
| 1215 | + if ($this->all_flights[$id]['putinarchive']) { |
|
| 1216 | + $send = true; |
|
| 1217 | + } |
|
| 971 | 1218 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 972 | - } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1219 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 1220 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1221 | + } |
|
| 973 | 1222 | //$this->del(); |
| 974 | 1223 | |
| 975 | 1224 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 976 | 1225 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 977 | - if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1226 | + if ($globalDebug) { |
|
| 1227 | + echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1228 | + } |
|
| 978 | 1229 | $SpotterLive = new SpotterLive($this->db); |
| 979 | 1230 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 980 | 1231 | $SpotterLive->db = null; |
| 981 | 1232 | //SpotterLive->deleteLiveSpotterData(); |
| 982 | - if ($globalDebug) echo " Done\n"; |
|
| 1233 | + if ($globalDebug) { |
|
| 1234 | + echo " Done\n"; |
|
| 1235 | + } |
|
| 983 | 1236 | $this->last_delete_hourly = time(); |
| 984 | 1237 | } else { |
| 985 | 1238 | $this->del(); |
@@ -991,7 +1244,9 @@ discard block |
||
| 991 | 1244 | //$ignoreImport = false; |
| 992 | 1245 | } |
| 993 | 1246 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 994 | - if ($send) return $this->all_flights[$id]; |
|
| 1247 | + if ($send) { |
|
| 1248 | + return $this->all_flights[$id]; |
|
| 1249 | + } |
|
| 995 | 1250 | } |
| 996 | 1251 | } |
| 997 | 1252 | } |
@@ -12,10 +12,10 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | - * Get SQL query part for filter used |
|
| 16 | - * @param Array $filter the filter |
|
| 17 | - * @return Array the SQL part |
|
| 18 | - */ |
|
| 15 | + * Get SQL query part for filter used |
|
| 16 | + * @param Array $filter the filter |
|
| 17 | + * @return Array the SQL part |
|
| 18 | + */ |
|
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
@@ -128,11 +128,11 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
| 131 | - * Gets all the spotter information based on the latest data entry |
|
| 132 | - * |
|
| 133 | - * @return Array the spotter information |
|
| 134 | - * |
|
| 135 | - */ |
|
| 131 | + * Gets all the spotter information based on the latest data entry |
|
| 132 | + * |
|
| 133 | + * @return Array the spotter information |
|
| 134 | + * |
|
| 135 | + */ |
|
| 136 | 136 | public function getLiveSpotterData($limit = '', $sort = '', $filter = array()) |
| 137 | 137 | { |
| 138 | 138 | global $globalDBdriver, $globalLiveInterval; |
@@ -175,11 +175,11 @@ discard block |
||
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | /** |
| 178 | - * Gets Minimal Live Spotter data |
|
| 179 | - * |
|
| 180 | - * @return Array the spotter information |
|
| 181 | - * |
|
| 182 | - */ |
|
| 178 | + * Gets Minimal Live Spotter data |
|
| 179 | + * |
|
| 180 | + * @return Array the spotter information |
|
| 181 | + * |
|
| 182 | + */ |
|
| 183 | 183 | public function getMinLiveSpotterData($filter = array()) |
| 184 | 184 | { |
| 185 | 185 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
@@ -216,11 +216,11 @@ discard block |
||
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | /** |
| 219 | - * Gets Minimal Live Spotter data since xx seconds |
|
| 220 | - * |
|
| 221 | - * @return Array the spotter information |
|
| 222 | - * |
|
| 223 | - */ |
|
| 219 | + * Gets Minimal Live Spotter data since xx seconds |
|
| 220 | + * |
|
| 221 | + * @return Array the spotter information |
|
| 222 | + * |
|
| 223 | + */ |
|
| 224 | 224 | public function getMinLastLiveSpotterData($filter = array()) |
| 225 | 225 | { |
| 226 | 226 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 240 | 240 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 241 | 241 | } |
| 242 | - } else { |
|
| 242 | + } else { |
|
| 243 | 243 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 244 | 244 | $query = "SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
| 245 | 245 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | } |
| 253 | 253 | } |
| 254 | 254 | |
| 255 | - try { |
|
| 255 | + try { |
|
| 256 | 256 | $sth = $this->db->prepare($query); |
| 257 | 257 | $sth->execute(); |
| 258 | 258 | } catch(PDOException $e) { |
@@ -264,11 +264,11 @@ discard block |
||
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | /** |
| 267 | - * Gets number of latest data entry |
|
| 268 | - * |
|
| 269 | - * @return String number of entry |
|
| 270 | - * |
|
| 271 | - */ |
|
| 267 | + * Gets number of latest data entry |
|
| 268 | + * |
|
| 269 | + * @return String number of entry |
|
| 270 | + * |
|
| 271 | + */ |
|
| 272 | 272 | public function getLiveSpotterCount($filter = array()) |
| 273 | 273 | { |
| 274 | 274 | global $globalDBdriver, $globalLiveInterval; |
@@ -295,11 +295,11 @@ discard block |
||
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | /** |
| 298 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 299 | - * |
|
| 300 | - * @return Array the spotter information |
|
| 301 | - * |
|
| 302 | - */ |
|
| 298 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 299 | + * |
|
| 300 | + * @return Array the spotter information |
|
| 301 | + * |
|
| 302 | + */ |
|
| 303 | 303 | public function getLiveSpotterDatabyCoord($coord, $filter = array()) |
| 304 | 304 | { |
| 305 | 305 | global $globalDBdriver, $globalLiveInterval; |
@@ -324,11 +324,11 @@ discard block |
||
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | /** |
| 327 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 328 | - * |
|
| 329 | - * @return Array the spotter information |
|
| 330 | - * |
|
| 331 | - */ |
|
| 327 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 328 | + * |
|
| 329 | + * @return Array the spotter information |
|
| 330 | + * |
|
| 331 | + */ |
|
| 332 | 332 | public function getMinLiveSpotterDatabyCoord($coord, $filter = array()) |
| 333 | 333 | { |
| 334 | 334 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
@@ -393,11 +393,11 @@ discard block |
||
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | /** |
| 396 | - * Gets all the spotter information based on a user's latitude and longitude |
|
| 397 | - * |
|
| 398 | - * @return Array the spotter information |
|
| 399 | - * |
|
| 400 | - */ |
|
| 396 | + * Gets all the spotter information based on a user's latitude and longitude |
|
| 397 | + * |
|
| 398 | + * @return Array the spotter information |
|
| 399 | + * |
|
| 400 | + */ |
|
| 401 | 401 | public function getLatestSpotterForLayar($lat, $lng, $radius, $interval) |
| 402 | 402 | { |
| 403 | 403 | $Spotter = new Spotter($this->db); |
@@ -407,117 +407,117 @@ discard block |
||
| 407 | 407 | return false; |
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | - if ($lng != '') |
|
| 411 | - { |
|
| 412 | - if (!is_numeric($lng)) |
|
| 413 | - { |
|
| 414 | - return false; |
|
| 415 | - } |
|
| 416 | - } |
|
| 417 | - |
|
| 418 | - if ($radius != '') |
|
| 419 | - { |
|
| 420 | - if (!is_numeric($radius)) |
|
| 421 | - { |
|
| 422 | - return false; |
|
| 423 | - } |
|
| 424 | - } |
|
| 410 | + if ($lng != '') |
|
| 411 | + { |
|
| 412 | + if (!is_numeric($lng)) |
|
| 413 | + { |
|
| 414 | + return false; |
|
| 415 | + } |
|
| 416 | + } |
|
| 417 | + |
|
| 418 | + if ($radius != '') |
|
| 419 | + { |
|
| 420 | + if (!is_numeric($radius)) |
|
| 421 | + { |
|
| 422 | + return false; |
|
| 423 | + } |
|
| 424 | + } |
|
| 425 | 425 | $additional_query = ''; |
| 426 | - if ($interval != '') |
|
| 427 | - { |
|
| 428 | - if (!is_string($interval)) |
|
| 429 | - { |
|
| 430 | - //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 431 | - return false; |
|
| 432 | - } else { |
|
| 433 | - if ($interval == '1m') |
|
| 434 | - { |
|
| 435 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 436 | - } else if ($interval == '15m'){ |
|
| 437 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 438 | - } |
|
| 439 | - } |
|
| 440 | - } else { |
|
| 441 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 442 | - } |
|
| 443 | - |
|
| 444 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 426 | + if ($interval != '') |
|
| 427 | + { |
|
| 428 | + if (!is_string($interval)) |
|
| 429 | + { |
|
| 430 | + //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 431 | + return false; |
|
| 432 | + } else { |
|
| 433 | + if ($interval == '1m') |
|
| 434 | + { |
|
| 435 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 436 | + } else if ($interval == '15m'){ |
|
| 437 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 438 | + } |
|
| 439 | + } |
|
| 440 | + } else { |
|
| 441 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 442 | + } |
|
| 443 | + |
|
| 444 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 445 | 445 | WHERE spotter_live.latitude <> '' |
| 446 | 446 | AND spotter_live.longitude <> '' |
| 447 | 447 | ".$additional_query." |
| 448 | 448 | HAVING distance < :radius |
| 449 | 449 | ORDER BY distance"; |
| 450 | 450 | |
| 451 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 451 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 452 | 452 | |
| 453 | - return $spotter_array; |
|
| 454 | - } |
|
| 453 | + return $spotter_array; |
|
| 454 | + } |
|
| 455 | 455 | |
| 456 | 456 | |
| 457 | - /** |
|
| 458 | - * Gets all the spotter information based on a particular callsign |
|
| 459 | - * |
|
| 460 | - * @return Array the spotter information |
|
| 461 | - * |
|
| 462 | - */ |
|
| 457 | + /** |
|
| 458 | + * Gets all the spotter information based on a particular callsign |
|
| 459 | + * |
|
| 460 | + * @return Array the spotter information |
|
| 461 | + * |
|
| 462 | + */ |
|
| 463 | 463 | public function getLastLiveSpotterDataByIdent($ident) |
| 464 | 464 | { |
| 465 | 465 | $Spotter = new Spotter($this->db); |
| 466 | 466 | date_default_timezone_set('UTC'); |
| 467 | 467 | |
| 468 | 468 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 469 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 469 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 470 | 470 | |
| 471 | 471 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
| 472 | 472 | |
| 473 | 473 | return $spotter_array; |
| 474 | 474 | } |
| 475 | 475 | |
| 476 | - /** |
|
| 477 | - * Gets all the spotter information based on a particular callsign |
|
| 478 | - * |
|
| 479 | - * @return Array the spotter information |
|
| 480 | - * |
|
| 481 | - */ |
|
| 476 | + /** |
|
| 477 | + * Gets all the spotter information based on a particular callsign |
|
| 478 | + * |
|
| 479 | + * @return Array the spotter information |
|
| 480 | + * |
|
| 481 | + */ |
|
| 482 | 482 | public function getDateLiveSpotterDataByIdent($ident,$date) |
| 483 | 483 | { |
| 484 | 484 | $Spotter = new Spotter($this->db); |
| 485 | 485 | date_default_timezone_set('UTC'); |
| 486 | 486 | |
| 487 | 487 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 488 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 488 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 489 | 489 | |
| 490 | - $date = date('c',$date); |
|
| 490 | + $date = date('c',$date); |
|
| 491 | 491 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 492 | 492 | |
| 493 | 493 | return $spotter_array; |
| 494 | 494 | } |
| 495 | 495 | |
| 496 | - /** |
|
| 497 | - * Gets last spotter information based on a particular callsign |
|
| 498 | - * |
|
| 499 | - * @return Array the spotter information |
|
| 500 | - * |
|
| 501 | - */ |
|
| 496 | + /** |
|
| 497 | + * Gets last spotter information based on a particular callsign |
|
| 498 | + * |
|
| 499 | + * @return Array the spotter information |
|
| 500 | + * |
|
| 501 | + */ |
|
| 502 | 502 | public function getLastLiveSpotterDataById($id) |
| 503 | 503 | { |
| 504 | 504 | $Spotter = new Spotter($this->db); |
| 505 | 505 | date_default_timezone_set('UTC'); |
| 506 | 506 | |
| 507 | 507 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 508 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 508 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 509 | 509 | |
| 510 | 510 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
| 511 | 511 | |
| 512 | 512 | return $spotter_array; |
| 513 | 513 | } |
| 514 | 514 | |
| 515 | - /** |
|
| 516 | - * Gets last spotter information based on a particular callsign |
|
| 517 | - * |
|
| 518 | - * @return Array the spotter information |
|
| 519 | - * |
|
| 520 | - */ |
|
| 515 | + /** |
|
| 516 | + * Gets last spotter information based on a particular callsign |
|
| 517 | + * |
|
| 518 | + * @return Array the spotter information |
|
| 519 | + * |
|
| 520 | + */ |
|
| 521 | 521 | public function getDateLiveSpotterDataById($id,$date) |
| 522 | 522 | { |
| 523 | 523 | $Spotter = new Spotter($this->db); |
@@ -530,21 +530,21 @@ discard block |
||
| 530 | 530 | return $spotter_array; |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | - /** |
|
| 534 | - * Gets altitude information based on a particular callsign |
|
| 535 | - * |
|
| 536 | - * @return Array the spotter information |
|
| 537 | - * |
|
| 538 | - */ |
|
| 533 | + /** |
|
| 534 | + * Gets altitude information based on a particular callsign |
|
| 535 | + * |
|
| 536 | + * @return Array the spotter information |
|
| 537 | + * |
|
| 538 | + */ |
|
| 539 | 539 | public function getAltitudeLiveSpotterDataByIdent($ident) |
| 540 | 540 | { |
| 541 | 541 | |
| 542 | 542 | date_default_timezone_set('UTC'); |
| 543 | 543 | |
| 544 | 544 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 545 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 545 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 546 | 546 | |
| 547 | - try { |
|
| 547 | + try { |
|
| 548 | 548 | |
| 549 | 549 | $sth = $this->db->prepare($query); |
| 550 | 550 | $sth->execute(array(':ident' => $ident)); |
@@ -557,12 +557,12 @@ discard block |
||
| 557 | 557 | return $spotter_array; |
| 558 | 558 | } |
| 559 | 559 | |
| 560 | - /** |
|
| 561 | - * Gets all the spotter information based on a particular id |
|
| 562 | - * |
|
| 563 | - * @return Array the spotter information |
|
| 564 | - * |
|
| 565 | - */ |
|
| 560 | + /** |
|
| 561 | + * Gets all the spotter information based on a particular id |
|
| 562 | + * |
|
| 563 | + * @return Array the spotter information |
|
| 564 | + * |
|
| 565 | + */ |
|
| 566 | 566 | public function getAllLiveSpotterDataById($id,$liveinterval = false) |
| 567 | 567 | { |
| 568 | 568 | global $globalDBdriver, $globalLiveInterval; |
@@ -590,18 +590,18 @@ discard block |
||
| 590 | 590 | return $spotter_array; |
| 591 | 591 | } |
| 592 | 592 | |
| 593 | - /** |
|
| 594 | - * Gets all the spotter information based on a particular ident |
|
| 595 | - * |
|
| 596 | - * @return Array the spotter information |
|
| 597 | - * |
|
| 598 | - */ |
|
| 593 | + /** |
|
| 594 | + * Gets all the spotter information based on a particular ident |
|
| 595 | + * |
|
| 596 | + * @return Array the spotter information |
|
| 597 | + * |
|
| 598 | + */ |
|
| 599 | 599 | public function getAllLiveSpotterDataByIdent($ident) |
| 600 | 600 | { |
| 601 | 601 | date_default_timezone_set('UTC'); |
| 602 | 602 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 603 | 603 | $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
| 604 | - try { |
|
| 604 | + try { |
|
| 605 | 605 | |
| 606 | 606 | $sth = $this->db->prepare($query); |
| 607 | 607 | $sth->execute(array(':ident' => $ident)); |
@@ -615,23 +615,23 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | |
| 617 | 617 | /** |
| 618 | - * Deletes all info in the table |
|
| 619 | - * |
|
| 620 | - * @return String success or false |
|
| 621 | - * |
|
| 622 | - */ |
|
| 618 | + * Deletes all info in the table |
|
| 619 | + * |
|
| 620 | + * @return String success or false |
|
| 621 | + * |
|
| 622 | + */ |
|
| 623 | 623 | public function deleteLiveSpotterData() |
| 624 | 624 | { |
| 625 | 625 | global $globalDBdriver; |
| 626 | 626 | if ($globalDBdriver == 'mysql') { |
| 627 | 627 | //$query = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date"; |
| 628 | 628 | $query = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date'; |
| 629 | - //$query = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)"; |
|
| 629 | + //$query = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)"; |
|
| 630 | 630 | } else { |
| 631 | 631 | $query = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date"; |
| 632 | 632 | } |
| 633 | 633 | |
| 634 | - try { |
|
| 634 | + try { |
|
| 635 | 635 | |
| 636 | 636 | $sth = $this->db->prepare($query); |
| 637 | 637 | $sth->execute(); |
@@ -643,18 +643,18 @@ discard block |
||
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | /** |
| 646 | - * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 647 | - * |
|
| 648 | - * @return String success or false |
|
| 649 | - * |
|
| 650 | - */ |
|
| 646 | + * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 647 | + * |
|
| 648 | + * @return String success or false |
|
| 649 | + * |
|
| 650 | + */ |
|
| 651 | 651 | public function deleteLiveSpotterDataNotUpdated() |
| 652 | 652 | { |
| 653 | 653 | global $globalDBdriver, $globalDebug; |
| 654 | 654 | if ($globalDBdriver == 'mysql') { |
| 655 | 655 | //$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0'; |
| 656 | - $query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0"; |
|
| 657 | - try { |
|
| 656 | + $query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0"; |
|
| 657 | + try { |
|
| 658 | 658 | |
| 659 | 659 | $sth = $this->db->prepare($query); |
| 660 | 660 | $sth->execute(); |
@@ -662,8 +662,8 @@ discard block |
||
| 662 | 662 | return "error"; |
| 663 | 663 | } |
| 664 | 664 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 665 | - $i = 0; |
|
| 666 | - $j =0; |
|
| 665 | + $i = 0; |
|
| 666 | + $j =0; |
|
| 667 | 667 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 668 | 668 | foreach($all as $row) |
| 669 | 669 | { |
@@ -671,20 +671,20 @@ discard block |
||
| 671 | 671 | $j++; |
| 672 | 672 | if ($j == 30) { |
| 673 | 673 | if ($globalDebug) echo "."; |
| 674 | - try { |
|
| 674 | + try { |
|
| 675 | 675 | |
| 676 | 676 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 677 | 677 | $sth->execute(); |
| 678 | 678 | } catch(PDOException $e) { |
| 679 | 679 | return "error"; |
| 680 | 680 | } |
| 681 | - $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 682 | - $j = 0; |
|
| 681 | + $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 682 | + $j = 0; |
|
| 683 | 683 | } |
| 684 | 684 | $query_delete .= "'".$row['flightaware_id']."',"; |
| 685 | 685 | } |
| 686 | 686 | if ($i > 0) { |
| 687 | - try { |
|
| 687 | + try { |
|
| 688 | 688 | |
| 689 | 689 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 690 | 690 | $sth->execute(); |
@@ -695,9 +695,9 @@ discard block |
||
| 695 | 695 | return "success"; |
| 696 | 696 | } elseif ($globalDBdriver == 'pgsql') { |
| 697 | 697 | //$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0"; |
| 698 | - //$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 699 | - $query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)"; |
|
| 700 | - try { |
|
| 698 | + //$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 699 | + $query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)"; |
|
| 700 | + try { |
|
| 701 | 701 | |
| 702 | 702 | $sth = $this->db->prepare($query); |
| 703 | 703 | $sth->execute(); |
@@ -741,17 +741,17 @@ discard block |
||
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | /** |
| 744 | - * Deletes all info in the table for an ident |
|
| 745 | - * |
|
| 746 | - * @return String success or false |
|
| 747 | - * |
|
| 748 | - */ |
|
| 744 | + * Deletes all info in the table for an ident |
|
| 745 | + * |
|
| 746 | + * @return String success or false |
|
| 747 | + * |
|
| 748 | + */ |
|
| 749 | 749 | public function deleteLiveSpotterDataByIdent($ident) |
| 750 | 750 | { |
| 751 | 751 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 752 | 752 | $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
| 753 | 753 | |
| 754 | - try { |
|
| 754 | + try { |
|
| 755 | 755 | |
| 756 | 756 | $sth = $this->db->prepare($query); |
| 757 | 757 | $sth->execute(array(':ident' => $ident)); |
@@ -763,17 +763,17 @@ discard block |
||
| 763 | 763 | } |
| 764 | 764 | |
| 765 | 765 | /** |
| 766 | - * Deletes all info in the table for an id |
|
| 767 | - * |
|
| 768 | - * @return String success or false |
|
| 769 | - * |
|
| 770 | - */ |
|
| 766 | + * Deletes all info in the table for an id |
|
| 767 | + * |
|
| 768 | + * @return String success or false |
|
| 769 | + * |
|
| 770 | + */ |
|
| 771 | 771 | public function deleteLiveSpotterDataById($id) |
| 772 | 772 | { |
| 773 | 773 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 774 | 774 | $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
| 775 | 775 | |
| 776 | - try { |
|
| 776 | + try { |
|
| 777 | 777 | |
| 778 | 778 | $sth = $this->db->prepare($query); |
| 779 | 779 | $sth->execute(array(':id' => $id)); |
@@ -786,11 +786,11 @@ discard block |
||
| 786 | 786 | |
| 787 | 787 | |
| 788 | 788 | /** |
| 789 | - * Gets the aircraft ident within the last hour |
|
| 790 | - * |
|
| 791 | - * @return String the ident |
|
| 792 | - * |
|
| 793 | - */ |
|
| 789 | + * Gets the aircraft ident within the last hour |
|
| 790 | + * |
|
| 791 | + * @return String the ident |
|
| 792 | + * |
|
| 793 | + */ |
|
| 794 | 794 | public function getIdentFromLastHour($ident) |
| 795 | 795 | { |
| 796 | 796 | global $globalDBdriver, $globalTimezone; |
@@ -816,14 +816,14 @@ discard block |
||
| 816 | 816 | $ident_result = $row['ident']; |
| 817 | 817 | } |
| 818 | 818 | return $ident_result; |
| 819 | - } |
|
| 819 | + } |
|
| 820 | 820 | |
| 821 | 821 | /** |
| 822 | - * Check recent aircraft |
|
| 823 | - * |
|
| 824 | - * @return String the ident |
|
| 825 | - * |
|
| 826 | - */ |
|
| 822 | + * Check recent aircraft |
|
| 823 | + * |
|
| 824 | + * @return String the ident |
|
| 825 | + * |
|
| 826 | + */ |
|
| 827 | 827 | public function checkIdentRecent($ident) |
| 828 | 828 | { |
| 829 | 829 | global $globalDBdriver, $globalTimezone; |
@@ -849,14 +849,14 @@ discard block |
||
| 849 | 849 | $ident_result = $row['flightaware_id']; |
| 850 | 850 | } |
| 851 | 851 | return $ident_result; |
| 852 | - } |
|
| 852 | + } |
|
| 853 | 853 | |
| 854 | 854 | /** |
| 855 | - * Check recent aircraft by id |
|
| 856 | - * |
|
| 857 | - * @return String the ident |
|
| 858 | - * |
|
| 859 | - */ |
|
| 855 | + * Check recent aircraft by id |
|
| 856 | + * |
|
| 857 | + * @return String the ident |
|
| 858 | + * |
|
| 859 | + */ |
|
| 860 | 860 | public function checkIdRecent($id) |
| 861 | 861 | { |
| 862 | 862 | global $globalDBdriver, $globalTimezone; |
@@ -882,14 +882,14 @@ discard block |
||
| 882 | 882 | $ident_result = $row['flightaware_id']; |
| 883 | 883 | } |
| 884 | 884 | return $ident_result; |
| 885 | - } |
|
| 885 | + } |
|
| 886 | 886 | |
| 887 | 887 | /** |
| 888 | - * Check recent aircraft by ModeS |
|
| 889 | - * |
|
| 890 | - * @return String the ModeS |
|
| 891 | - * |
|
| 892 | - */ |
|
| 888 | + * Check recent aircraft by ModeS |
|
| 889 | + * |
|
| 890 | + * @return String the ModeS |
|
| 891 | + * |
|
| 892 | + */ |
|
| 893 | 893 | public function checkModeSRecent($modes) |
| 894 | 894 | { |
| 895 | 895 | global $globalDBdriver, $globalTimezone; |
@@ -916,19 +916,19 @@ discard block |
||
| 916 | 916 | $ident_result = $row['flightaware_id']; |
| 917 | 917 | } |
| 918 | 918 | return $ident_result; |
| 919 | - } |
|
| 919 | + } |
|
| 920 | 920 | |
| 921 | 921 | /** |
| 922 | - * Adds a new spotter data |
|
| 923 | - * |
|
| 924 | - * @param String $flightaware_id the ID from flightaware |
|
| 925 | - * @param String $ident the flight ident |
|
| 926 | - * @param String $aircraft_icao the aircraft type |
|
| 927 | - * @param String $departure_airport_icao the departure airport |
|
| 928 | - * @param String $arrival_airport_icao the arrival airport |
|
| 929 | - * @return String success or false |
|
| 930 | - * |
|
| 931 | - */ |
|
| 922 | + * Adds a new spotter data |
|
| 923 | + * |
|
| 924 | + * @param String $flightaware_id the ID from flightaware |
|
| 925 | + * @param String $ident the flight ident |
|
| 926 | + * @param String $aircraft_icao the aircraft type |
|
| 927 | + * @param String $departure_airport_icao the departure airport |
|
| 928 | + * @param String $arrival_airport_icao the arrival airport |
|
| 929 | + * @return String success or false |
|
| 930 | + * |
|
| 931 | + */ |
|
| 932 | 932 | public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
| 933 | 933 | { |
| 934 | 934 | global $globalURL, $globalArchive, $globalDebug; |
@@ -1064,10 +1064,10 @@ discard block |
||
| 1064 | 1064 | $arrival_airport_country = ''; |
| 1065 | 1065 | |
| 1066 | 1066 | |
| 1067 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1068 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1069 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1070 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1067 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1068 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1069 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1070 | + if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1071 | 1071 | |
| 1072 | 1072 | $query = ''; |
| 1073 | 1073 | if ($globalArchive) { |
@@ -1088,10 +1088,10 @@ discard block |
||
| 1088 | 1088 | return "error : ".$e->getMessage(); |
| 1089 | 1089 | } |
| 1090 | 1090 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1091 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1092 | - $SpotterArchive = new SpotterArchive($this->db); |
|
| 1093 | - $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1094 | - if ($globalDebug) echo $result.')'; |
|
| 1091 | + if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1092 | + $SpotterArchive = new SpotterArchive($this->db); |
|
| 1093 | + $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1094 | + if ($globalDebug) echo $result.')'; |
|
| 1095 | 1095 | } |
| 1096 | 1096 | return "success"; |
| 1097 | 1097 | |
@@ -16,62 +16,62 @@ discard block |
||
| 16 | 16 | * @param Array $filter the filter |
| 17 | 17 | * @return Array the SQL part |
| 18 | 18 | */ |
| 19 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
| 22 | 22 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 23 | 23 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 24 | 24 | $filters = $globalStatsFilters[$globalFilterName]; |
| 25 | 25 | } else { |
| 26 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 26 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | - $filters = array_merge($filters,$filter); |
|
| 30 | + $filters = array_merge($filters, $filter); |
|
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 33 | 33 | $filter_query_join = ''; |
| 34 | 34 | $filter_query_where = ''; |
| 35 | - foreach($filters as $flt) { |
|
| 35 | + foreach ($filters as $flt) { |
|
| 36 | 36 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 37 | 37 | if ($flt['airlines'][0] != '') { |
| 38 | 38 | if (isset($flt['source'])) { |
| 39 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 39 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 40 | 40 | } else { |
| 41 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 41 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 46 | 46 | if (isset($flt['source'])) { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 48 | 48 | } else { |
| 49 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 49 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 53 | 53 | if (isset($flt['source'])) { |
| 54 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 54 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 55 | 55 | } else { |
| 56 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 56 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 60 | 60 | if (isset($flt['source'])) { |
| 61 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 61 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 62 | 62 | } else { |
| 63 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 63 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 67 | 67 | if (isset($flt['source'])) { |
| 68 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 68 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 73 | 73 | if ($filter['airlines'][0] != '') { |
| 74 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 74 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | if (isset($filter['alliance']) && !empty($filter['alliance'])) { |
@@ -81,10 +81,10 @@ discard block |
||
| 81 | 81 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
| 82 | 82 | } |
| 83 | 83 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 84 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 84 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 85 | 85 | } |
| 86 | 86 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 87 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 87 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 88 | 88 | } |
| 89 | 89 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 90 | 90 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -113,15 +113,15 @@ discard block |
||
| 113 | 113 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'"; |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 116 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 117 | 117 | } |
| 118 | 118 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 119 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 119 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 120 | 120 | } |
| 121 | 121 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 122 | 122 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 123 | 123 | if ($filter_query_where != '') { |
| 124 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 124 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 125 | 125 | } |
| 126 | 126 | $filter_query = $filter_query_join.$filter_query_where; |
| 127 | 127 | return $filter_query; |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | if ($limit != '') |
| 145 | 145 | { |
| 146 | 146 | $limit_array = explode(',', $limit); |
| 147 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 147 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 149 | 149 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 150 | 150 | { |
| 151 | 151 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | } else { |
| 170 | 170 | $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query; |
| 171 | 171 | } |
| 172 | - $spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 172 | + $spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 173 | 173 | |
| 174 | 174 | return $spotter_array; |
| 175 | 175 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | { |
| 185 | 185 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 186 | 186 | date_default_timezone_set('UTC'); |
| 187 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 187 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 188 | 188 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 189 | 189 | if ($globalDBdriver == 'mysql') { |
| 190 | 190 | if (isset($globalArchive) && $globalArchive === TRUE) { |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | try { |
| 208 | 208 | $sth = $this->db->prepare($query); |
| 209 | 209 | $sth->execute(); |
| 210 | - } catch(PDOException $e) { |
|
| 210 | + } catch (PDOException $e) { |
|
| 211 | 211 | echo $e->getMessage(); |
| 212 | 212 | die; |
| 213 | 213 | } |
@@ -226,27 +226,27 @@ discard block |
||
| 226 | 226 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 227 | 227 | date_default_timezone_set('UTC'); |
| 228 | 228 | |
| 229 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 229 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 230 | 230 | |
| 231 | 231 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 232 | 232 | if ($globalDBdriver == 'mysql') { |
| 233 | 233 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 234 | - $query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
|
| 234 | + $query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
|
| 235 | 235 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id AND spotter_archive.latitude <> '0' AND spotter_archive.longitude <> '0' |
| 236 | 236 | ORDER BY spotter_archive.flightaware_id, spotter_archive.date"; |
| 237 | 237 | } else { |
| 238 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 238 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 239 | 239 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 240 | 240 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 241 | 241 | } |
| 242 | 242 | } else { |
| 243 | 243 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 244 | - $query = "SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
|
| 244 | + $query = "SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
|
| 245 | 245 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id |
| 246 | 246 | WHERE spotter_archive.latitude <> '0' AND spotter_archive.longitude <> '0' |
| 247 | 247 | ORDER BY spotter_archive.flightaware_id, spotter_archive.date"; |
| 248 | 248 | } else { |
| 249 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 249 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 250 | 250 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 251 | 251 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 252 | 252 | } |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | try { |
| 256 | 256 | $sth = $this->db->prepare($query); |
| 257 | 257 | $sth->execute(); |
| 258 | - } catch(PDOException $e) { |
|
| 258 | + } catch (PDOException $e) { |
|
| 259 | 259 | echo $e->getMessage(); |
| 260 | 260 | die; |
| 261 | 261 | } |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | public function getLiveSpotterCount($filter = array()) |
| 273 | 273 | { |
| 274 | 274 | global $globalDBdriver, $globalLiveInterval; |
| 275 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 275 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 276 | 276 | |
| 277 | 277 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 278 | 278 | if ($globalDBdriver == 'mysql') { |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | try { |
| 286 | 286 | $sth = $this->db->prepare($query); |
| 287 | 287 | $sth->execute(); |
| 288 | - } catch(PDOException $e) { |
|
| 288 | + } catch (PDOException $e) { |
|
| 289 | 289 | echo $e->getMessage(); |
| 290 | 290 | die; |
| 291 | 291 | } |
@@ -308,10 +308,10 @@ discard block |
||
| 308 | 308 | $filter_query = $this->getFilter($filter); |
| 309 | 309 | |
| 310 | 310 | if (is_array($coord)) { |
| 311 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 312 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 313 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 314 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 311 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 312 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 313 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 314 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 315 | 315 | } else return array(); |
| 316 | 316 | if ($globalDBdriver == 'mysql') { |
| 317 | 317 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
@@ -334,23 +334,23 @@ discard block |
||
| 334 | 334 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 335 | 335 | $Spotter = new Spotter($this->db); |
| 336 | 336 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 337 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 337 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 338 | 338 | |
| 339 | 339 | if (is_array($coord)) { |
| 340 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 341 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 342 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 343 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 340 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 341 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 342 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 343 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 344 | 344 | } else return array(); |
| 345 | 345 | if ($globalDBdriver == 'mysql') { |
| 346 | 346 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 347 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 347 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 348 | 348 | FROM spotter_live |
| 349 | 349 | '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date |
| 350 | 350 | AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' |
| 351 | 351 | AND spotter_live.latitude <> 0 AND spotter_live.longitude <> 0'; |
| 352 | 352 | } else { |
| 353 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 353 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 354 | 354 | FROM spotter_live |
| 355 | 355 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 356 | 356 | FROM spotter_live l |
@@ -362,14 +362,14 @@ discard block |
||
| 362 | 362 | } |
| 363 | 363 | } else { |
| 364 | 364 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 365 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 365 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 366 | 366 | FROM spotter_live |
| 367 | 367 | ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date |
| 368 | 368 | AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." |
| 369 | 369 | AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." |
| 370 | 370 | AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 371 | 371 | } else { |
| 372 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 372 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 373 | 373 | FROM spotter_live |
| 374 | 374 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 375 | 375 | FROM spotter_live l |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | try { |
| 385 | 385 | $sth = $this->db->prepare($query); |
| 386 | 386 | $sth->execute(); |
| 387 | - } catch(PDOException $e) { |
|
| 387 | + } catch (PDOException $e) { |
|
| 388 | 388 | echo $e->getMessage(); |
| 389 | 389 | die; |
| 390 | 390 | } |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | if ($interval == '1m') |
| 434 | 434 | { |
| 435 | 435 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 436 | - } else if ($interval == '15m'){ |
|
| 436 | + } else if ($interval == '15m') { |
|
| 437 | 437 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
| 438 | 438 | } |
| 439 | 439 | } |
@@ -441,14 +441,14 @@ discard block |
||
| 441 | 441 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 442 | 442 | } |
| 443 | 443 | |
| 444 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 444 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 445 | 445 | WHERE spotter_live.latitude <> '' |
| 446 | 446 | AND spotter_live.longitude <> '' |
| 447 | 447 | ".$additional_query." |
| 448 | 448 | HAVING distance < :radius |
| 449 | 449 | ORDER BY distance"; |
| 450 | 450 | |
| 451 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 451 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 452 | 452 | |
| 453 | 453 | return $spotter_array; |
| 454 | 454 | } |
@@ -466,9 +466,9 @@ discard block |
||
| 466 | 466 | date_default_timezone_set('UTC'); |
| 467 | 467 | |
| 468 | 468 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 469 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 469 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 470 | 470 | |
| 471 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 471 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 472 | 472 | |
| 473 | 473 | return $spotter_array; |
| 474 | 474 | } |
@@ -479,16 +479,16 @@ discard block |
||
| 479 | 479 | * @return Array the spotter information |
| 480 | 480 | * |
| 481 | 481 | */ |
| 482 | - public function getDateLiveSpotterDataByIdent($ident,$date) |
|
| 482 | + public function getDateLiveSpotterDataByIdent($ident, $date) |
|
| 483 | 483 | { |
| 484 | 484 | $Spotter = new Spotter($this->db); |
| 485 | 485 | date_default_timezone_set('UTC'); |
| 486 | 486 | |
| 487 | 487 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 488 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 488 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 489 | 489 | |
| 490 | - $date = date('c',$date); |
|
| 491 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 490 | + $date = date('c', $date); |
|
| 491 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 492 | 492 | |
| 493 | 493 | return $spotter_array; |
| 494 | 494 | } |
@@ -505,9 +505,9 @@ discard block |
||
| 505 | 505 | date_default_timezone_set('UTC'); |
| 506 | 506 | |
| 507 | 507 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 508 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 508 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 509 | 509 | |
| 510 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 510 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 511 | 511 | |
| 512 | 512 | return $spotter_array; |
| 513 | 513 | } |
@@ -518,15 +518,15 @@ discard block |
||
| 518 | 518 | * @return Array the spotter information |
| 519 | 519 | * |
| 520 | 520 | */ |
| 521 | - public function getDateLiveSpotterDataById($id,$date) |
|
| 521 | + public function getDateLiveSpotterDataById($id, $date) |
|
| 522 | 522 | { |
| 523 | 523 | $Spotter = new Spotter($this->db); |
| 524 | 524 | date_default_timezone_set('UTC'); |
| 525 | 525 | |
| 526 | 526 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 527 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 528 | - $date = date('c',$date); |
|
| 529 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 527 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 528 | + $date = date('c', $date); |
|
| 529 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 530 | 530 | return $spotter_array; |
| 531 | 531 | } |
| 532 | 532 | |
@@ -542,13 +542,13 @@ discard block |
||
| 542 | 542 | date_default_timezone_set('UTC'); |
| 543 | 543 | |
| 544 | 544 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 545 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 545 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 546 | 546 | |
| 547 | 547 | try { |
| 548 | 548 | |
| 549 | 549 | $sth = $this->db->prepare($query); |
| 550 | 550 | $sth->execute(array(':ident' => $ident)); |
| 551 | - } catch(PDOException $e) { |
|
| 551 | + } catch (PDOException $e) { |
|
| 552 | 552 | echo $e->getMessage(); |
| 553 | 553 | die; |
| 554 | 554 | } |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | * @return Array the spotter information |
| 564 | 564 | * |
| 565 | 565 | */ |
| 566 | - public function getAllLiveSpotterDataById($id,$liveinterval = false) |
|
| 566 | + public function getAllLiveSpotterDataById($id, $liveinterval = false) |
|
| 567 | 567 | { |
| 568 | 568 | global $globalDBdriver, $globalLiveInterval; |
| 569 | 569 | date_default_timezone_set('UTC'); |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | try { |
| 583 | 583 | $sth = $this->db->prepare($query); |
| 584 | 584 | $sth->execute(array(':id' => $id)); |
| 585 | - } catch(PDOException $e) { |
|
| 585 | + } catch (PDOException $e) { |
|
| 586 | 586 | echo $e->getMessage(); |
| 587 | 587 | die; |
| 588 | 588 | } |
@@ -600,12 +600,12 @@ discard block |
||
| 600 | 600 | { |
| 601 | 601 | date_default_timezone_set('UTC'); |
| 602 | 602 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 603 | - $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 603 | + $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 604 | 604 | try { |
| 605 | 605 | |
| 606 | 606 | $sth = $this->db->prepare($query); |
| 607 | 607 | $sth->execute(array(':ident' => $ident)); |
| 608 | - } catch(PDOException $e) { |
|
| 608 | + } catch (PDOException $e) { |
|
| 609 | 609 | echo $e->getMessage(); |
| 610 | 610 | die; |
| 611 | 611 | } |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | |
| 636 | 636 | $sth = $this->db->prepare($query); |
| 637 | 637 | $sth->execute(); |
| 638 | - } catch(PDOException $e) { |
|
| 638 | + } catch (PDOException $e) { |
|
| 639 | 639 | return "error"; |
| 640 | 640 | } |
| 641 | 641 | |
@@ -658,14 +658,14 @@ discard block |
||
| 658 | 658 | |
| 659 | 659 | $sth = $this->db->prepare($query); |
| 660 | 660 | $sth->execute(); |
| 661 | - } catch(PDOException $e) { |
|
| 661 | + } catch (PDOException $e) { |
|
| 662 | 662 | return "error"; |
| 663 | 663 | } |
| 664 | 664 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 665 | 665 | $i = 0; |
| 666 | - $j =0; |
|
| 666 | + $j = 0; |
|
| 667 | 667 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 668 | - foreach($all as $row) |
|
| 668 | + foreach ($all as $row) |
|
| 669 | 669 | { |
| 670 | 670 | $i++; |
| 671 | 671 | $j++; |
@@ -673,9 +673,9 @@ discard block |
||
| 673 | 673 | if ($globalDebug) echo "."; |
| 674 | 674 | try { |
| 675 | 675 | |
| 676 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 676 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 677 | 677 | $sth->execute(); |
| 678 | - } catch(PDOException $e) { |
|
| 678 | + } catch (PDOException $e) { |
|
| 679 | 679 | return "error"; |
| 680 | 680 | } |
| 681 | 681 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
@@ -686,9 +686,9 @@ discard block |
||
| 686 | 686 | if ($i > 0) { |
| 687 | 687 | try { |
| 688 | 688 | |
| 689 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 689 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 690 | 690 | $sth->execute(); |
| 691 | - } catch(PDOException $e) { |
|
| 691 | + } catch (PDOException $e) { |
|
| 692 | 692 | return "error"; |
| 693 | 693 | } |
| 694 | 694 | } |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | |
| 702 | 702 | $sth = $this->db->prepare($query); |
| 703 | 703 | $sth->execute(); |
| 704 | - } catch(PDOException $e) { |
|
| 704 | + } catch (PDOException $e) { |
|
| 705 | 705 | return "error"; |
| 706 | 706 | } |
| 707 | 707 | /* $query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN ("; |
@@ -749,13 +749,13 @@ discard block |
||
| 749 | 749 | public function deleteLiveSpotterDataByIdent($ident) |
| 750 | 750 | { |
| 751 | 751 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 752 | - $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 752 | + $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 753 | 753 | |
| 754 | 754 | try { |
| 755 | 755 | |
| 756 | 756 | $sth = $this->db->prepare($query); |
| 757 | 757 | $sth->execute(array(':ident' => $ident)); |
| 758 | - } catch(PDOException $e) { |
|
| 758 | + } catch (PDOException $e) { |
|
| 759 | 759 | return "error"; |
| 760 | 760 | } |
| 761 | 761 | |
@@ -771,13 +771,13 @@ discard block |
||
| 771 | 771 | public function deleteLiveSpotterDataById($id) |
| 772 | 772 | { |
| 773 | 773 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 774 | - $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 774 | + $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 775 | 775 | |
| 776 | 776 | try { |
| 777 | 777 | |
| 778 | 778 | $sth = $this->db->prepare($query); |
| 779 | 779 | $sth->execute(array(':id' => $id)); |
| 780 | - } catch(PDOException $e) { |
|
| 780 | + } catch (PDOException $e) { |
|
| 781 | 781 | return "error"; |
| 782 | 782 | } |
| 783 | 783 | |
@@ -795,13 +795,13 @@ discard block |
||
| 795 | 795 | { |
| 796 | 796 | global $globalDBdriver, $globalTimezone; |
| 797 | 797 | if ($globalDBdriver == 'mysql') { |
| 798 | - $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 798 | + $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 799 | 799 | WHERE spotter_live.ident = :ident |
| 800 | 800 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 801 | 801 | AND spotter_live.date < UTC_TIMESTAMP()'; |
| 802 | 802 | $query_data = array(':ident' => $ident); |
| 803 | 803 | } else { |
| 804 | - $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 804 | + $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 805 | 805 | WHERE spotter_live.ident = :ident |
| 806 | 806 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 807 | 807 | AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -810,8 +810,8 @@ discard block |
||
| 810 | 810 | |
| 811 | 811 | $sth = $this->db->prepare($query); |
| 812 | 812 | $sth->execute($query_data); |
| 813 | - $ident_result=''; |
|
| 814 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 813 | + $ident_result = ''; |
|
| 814 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 815 | 815 | { |
| 816 | 816 | $ident_result = $row['ident']; |
| 817 | 817 | } |
@@ -828,13 +828,13 @@ discard block |
||
| 828 | 828 | { |
| 829 | 829 | global $globalDBdriver, $globalTimezone; |
| 830 | 830 | if ($globalDBdriver == 'mysql') { |
| 831 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 831 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 832 | 832 | WHERE spotter_live.ident = :ident |
| 833 | 833 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 834 | 834 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 835 | 835 | $query_data = array(':ident' => $ident); |
| 836 | 836 | } else { |
| 837 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 837 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 838 | 838 | WHERE spotter_live.ident = :ident |
| 839 | 839 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 840 | 840 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -843,8 +843,8 @@ discard block |
||
| 843 | 843 | |
| 844 | 844 | $sth = $this->db->prepare($query); |
| 845 | 845 | $sth->execute($query_data); |
| 846 | - $ident_result=''; |
|
| 847 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 846 | + $ident_result = ''; |
|
| 847 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 848 | 848 | { |
| 849 | 849 | $ident_result = $row['flightaware_id']; |
| 850 | 850 | } |
@@ -861,13 +861,13 @@ discard block |
||
| 861 | 861 | { |
| 862 | 862 | global $globalDBdriver, $globalTimezone; |
| 863 | 863 | if ($globalDBdriver == 'mysql') { |
| 864 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 864 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 865 | 865 | WHERE spotter_live.flightaware_id = :id |
| 866 | 866 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 867 | 867 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 868 | 868 | $query_data = array(':id' => $id); |
| 869 | 869 | } else { |
| 870 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 870 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 871 | 871 | WHERE spotter_live.flightaware_id = :id |
| 872 | 872 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 873 | 873 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -876,8 +876,8 @@ discard block |
||
| 876 | 876 | |
| 877 | 877 | $sth = $this->db->prepare($query); |
| 878 | 878 | $sth->execute($query_data); |
| 879 | - $ident_result=''; |
|
| 880 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 879 | + $ident_result = ''; |
|
| 880 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 881 | 881 | { |
| 882 | 882 | $ident_result = $row['flightaware_id']; |
| 883 | 883 | } |
@@ -894,13 +894,13 @@ discard block |
||
| 894 | 894 | { |
| 895 | 895 | global $globalDBdriver, $globalTimezone; |
| 896 | 896 | if ($globalDBdriver == 'mysql') { |
| 897 | - $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 897 | + $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 898 | 898 | WHERE spotter_live.ModeS = :modes |
| 899 | 899 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 900 | 900 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 901 | 901 | $query_data = array(':modes' => $modes); |
| 902 | 902 | } else { |
| 903 | - $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 903 | + $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 904 | 904 | WHERE spotter_live.ModeS = :modes |
| 905 | 905 | AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'"; |
| 906 | 906 | // // AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
@@ -909,8 +909,8 @@ discard block |
||
| 909 | 909 | |
| 910 | 910 | $sth = $this->db->prepare($query); |
| 911 | 911 | $sth->execute($query_data); |
| 912 | - $ident_result=''; |
|
| 913 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 912 | + $ident_result = ''; |
|
| 913 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 914 | 914 | { |
| 915 | 915 | //$ident_result = $row['spotter_live_id']; |
| 916 | 916 | $ident_result = $row['flightaware_id']; |
@@ -929,7 +929,7 @@ discard block |
||
| 929 | 929 | * @return String success or false |
| 930 | 930 | * |
| 931 | 931 | */ |
| 932 | - public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
|
| 932 | + public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '') |
|
| 933 | 933 | { |
| 934 | 934 | global $globalURL, $globalArchive, $globalDebug; |
| 935 | 935 | $Common = new Common(); |
@@ -1022,27 +1022,27 @@ discard block |
||
| 1022 | 1022 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 1023 | 1023 | |
| 1024 | 1024 | |
| 1025 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 1026 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1027 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 1028 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1029 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1030 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1031 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1032 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 1033 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1034 | - $altitude_real = filter_var($altitude_real,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1035 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 1036 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1037 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 1038 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 1039 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 1040 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 1041 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 1042 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 1043 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 1044 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 1045 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 1025 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 1026 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1027 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 1028 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1029 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1030 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1031 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1032 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 1033 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1034 | + $altitude_real = filter_var($altitude_real, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1035 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 1036 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1037 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 1038 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 1039 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 1040 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 1041 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 1042 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 1043 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 1044 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 1045 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 1046 | 1046 | |
| 1047 | 1047 | $airline_name = ''; |
| 1048 | 1048 | $airline_icao = ''; |
@@ -1064,10 +1064,10 @@ discard block |
||
| 1064 | 1064 | $arrival_airport_country = ''; |
| 1065 | 1065 | |
| 1066 | 1066 | |
| 1067 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1068 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1069 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1070 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1067 | + if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL; |
|
| 1068 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL; |
|
| 1069 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 1070 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 1071 | 1071 | |
| 1072 | 1072 | $query = ''; |
| 1073 | 1073 | if ($globalArchive) { |
@@ -1078,19 +1078,19 @@ discard block |
||
| 1078 | 1078 | $query .= 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country, real_altitude) |
| 1079 | 1079 | VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country, :real_altitude)'; |
| 1080 | 1080 | |
| 1081 | - $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_shadow' => $aircraft_shadow,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk,':route_stop' => $route_stop,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country,':real_altitude' => $altitude_real); |
|
| 1081 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country, ':real_altitude' => $altitude_real); |
|
| 1082 | 1082 | try { |
| 1083 | 1083 | |
| 1084 | 1084 | $sth = $this->db->prepare($query); |
| 1085 | 1085 | $sth->execute($query_values); |
| 1086 | 1086 | $sth->closeCursor(); |
| 1087 | - } catch(PDOException $e) { |
|
| 1087 | + } catch (PDOException $e) { |
|
| 1088 | 1088 | return "error : ".$e->getMessage(); |
| 1089 | 1089 | } |
| 1090 | 1090 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1091 | 1091 | if ($globalDebug) echo '(Add to SBS archive : '; |
| 1092 | 1092 | $SpotterArchive = new SpotterArchive($this->db); |
| 1093 | - $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1093 | + $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time, $arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country); |
|
| 1094 | 1094 | if ($globalDebug) echo $result.')'; |
| 1095 | 1095 | } |
| 1096 | 1096 | return "success"; |
@@ -1099,7 +1099,7 @@ discard block |
||
| 1099 | 1099 | |
| 1100 | 1100 | public function getOrderBy() |
| 1101 | 1101 | { |
| 1102 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1102 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1103 | 1103 | return $orderby; |
| 1104 | 1104 | } |
| 1105 | 1105 | |
@@ -29,7 +29,9 @@ discard block |
||
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | 30 | $filters = array_merge($filters,$filter); |
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) { |
|
| 33 | + $filter = array_merge($filter,$globalFilter); |
|
| 34 | + } |
|
| 33 | 35 | $filter_query_join = ''; |
| 34 | 36 | $filter_query_where = ''; |
| 35 | 37 | foreach($filters as $flt) { |
@@ -118,8 +120,11 @@ discard block |
||
| 118 | 120 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 119 | 121 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 120 | 122 | } |
| 121 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 122 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 123 | + if ($filter_query_where == '' && $where) { |
|
| 124 | + $filter_query_where = ' WHERE'; |
|
| 125 | + } elseif ($filter_query_where != '' && $and) { |
|
| 126 | + $filter_query_where .= ' AND'; |
|
| 127 | + } |
|
| 123 | 128 | if ($filter_query_where != '') { |
| 124 | 129 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 125 | 130 | } |
@@ -160,9 +165,13 @@ discard block |
||
| 160 | 165 | $orderby_query = ' '.$search_orderby_array[$sort]['sql']; |
| 161 | 166 | } |
| 162 | 167 | } |
| 163 | - if ($orderby_query == '') $orderby_query = ' ORDER BY date DESC'; |
|
| 168 | + if ($orderby_query == '') { |
|
| 169 | + $orderby_query = ' ORDER BY date DESC'; |
|
| 170 | + } |
|
| 164 | 171 | |
| 165 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 172 | + if (!isset($globalLiveInterval)) { |
|
| 173 | + $globalLiveInterval = '200'; |
|
| 174 | + } |
|
| 166 | 175 | if ($globalDBdriver == 'mysql') { |
| 167 | 176 | //$query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
| 168 | 177 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query; |
@@ -185,7 +194,9 @@ discard block |
||
| 185 | 194 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 186 | 195 | date_default_timezone_set('UTC'); |
| 187 | 196 | $filter_query = $this->getFilter($filter,true,true); |
| 188 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 197 | + if (!isset($globalLiveInterval)) { |
|
| 198 | + $globalLiveInterval = '200'; |
|
| 199 | + } |
|
| 189 | 200 | if ($globalDBdriver == 'mysql') { |
| 190 | 201 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 191 | 202 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
@@ -228,7 +239,9 @@ discard block |
||
| 228 | 239 | |
| 229 | 240 | $filter_query = $this->getFilter($filter,true,true); |
| 230 | 241 | |
| 231 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 242 | + if (!isset($globalLiveInterval)) { |
|
| 243 | + $globalLiveInterval = '200'; |
|
| 244 | + } |
|
| 232 | 245 | if ($globalDBdriver == 'mysql') { |
| 233 | 246 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 234 | 247 | $query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
@@ -274,7 +287,9 @@ discard block |
||
| 274 | 287 | global $globalDBdriver, $globalLiveInterval; |
| 275 | 288 | $filter_query = $this->getFilter($filter,true,true); |
| 276 | 289 | |
| 277 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 290 | + if (!isset($globalLiveInterval)) { |
|
| 291 | + $globalLiveInterval = '200'; |
|
| 292 | + } |
|
| 278 | 293 | if ($globalDBdriver == 'mysql') { |
| 279 | 294 | //$query = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query; |
| 280 | 295 | $query = 'SELECT COUNT(DISTINCT spotter_live.flightaware_id) as nb FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
@@ -304,7 +319,9 @@ discard block |
||
| 304 | 319 | { |
| 305 | 320 | global $globalDBdriver, $globalLiveInterval; |
| 306 | 321 | $Spotter = new Spotter($this->db); |
| 307 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 322 | + if (!isset($globalLiveInterval)) { |
|
| 323 | + $globalLiveInterval = '200'; |
|
| 324 | + } |
|
| 308 | 325 | $filter_query = $this->getFilter($filter); |
| 309 | 326 | |
| 310 | 327 | if (is_array($coord)) { |
@@ -312,7 +329,9 @@ discard block |
||
| 312 | 329 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 313 | 330 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 314 | 331 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 315 | - } else return array(); |
|
| 332 | + } else { |
|
| 333 | + return array(); |
|
| 334 | + } |
|
| 316 | 335 | if ($globalDBdriver == 'mysql') { |
| 317 | 336 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
| 318 | 337 | } else { |
@@ -333,7 +352,9 @@ discard block |
||
| 333 | 352 | { |
| 334 | 353 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 335 | 354 | $Spotter = new Spotter($this->db); |
| 336 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 355 | + if (!isset($globalLiveInterval)) { |
|
| 356 | + $globalLiveInterval = '200'; |
|
| 357 | + } |
|
| 337 | 358 | $filter_query = $this->getFilter($filter,true,true); |
| 338 | 359 | |
| 339 | 360 | if (is_array($coord)) { |
@@ -341,7 +362,9 @@ discard block |
||
| 341 | 362 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 342 | 363 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 343 | 364 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 344 | - } else return array(); |
|
| 365 | + } else { |
|
| 366 | + return array(); |
|
| 367 | + } |
|
| 345 | 368 | if ($globalDBdriver == 'mysql') { |
| 346 | 369 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 347 | 370 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
@@ -571,11 +594,15 @@ discard block |
||
| 571 | 594 | //$query = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date'; |
| 572 | 595 | if ($globalDBdriver == 'mysql') { |
| 573 | 596 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 574 | - if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 597 | + if ($liveinterval) { |
|
| 598 | + $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 599 | + } |
|
| 575 | 600 | $query .= ' ORDER BY date'; |
| 576 | 601 | } else { |
| 577 | 602 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 578 | - if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 603 | + if ($liveinterval) { |
|
| 604 | + $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 605 | + } |
|
| 579 | 606 | $query .= ' ORDER BY date'; |
| 580 | 607 | } |
| 581 | 608 | |
@@ -670,7 +697,9 @@ discard block |
||
| 670 | 697 | $i++; |
| 671 | 698 | $j++; |
| 672 | 699 | if ($j == 30) { |
| 673 | - if ($globalDebug) echo "."; |
|
| 700 | + if ($globalDebug) { |
|
| 701 | + echo "."; |
|
| 702 | + } |
|
| 674 | 703 | try { |
| 675 | 704 | |
| 676 | 705 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
@@ -977,7 +1006,9 @@ discard block |
||
| 977 | 1006 | { |
| 978 | 1007 | return false; |
| 979 | 1008 | } |
| 980 | - } else return ''; |
|
| 1009 | + } else { |
|
| 1010 | + return ''; |
|
| 1011 | + } |
|
| 981 | 1012 | |
| 982 | 1013 | if ($longitude != '') |
| 983 | 1014 | { |
@@ -985,7 +1016,9 @@ discard block |
||
| 985 | 1016 | { |
| 986 | 1017 | return false; |
| 987 | 1018 | } |
| 988 | - } else return ''; |
|
| 1019 | + } else { |
|
| 1020 | + return ''; |
|
| 1021 | + } |
|
| 989 | 1022 | |
| 990 | 1023 | if ($waypoints != '') |
| 991 | 1024 | { |
@@ -1001,7 +1034,9 @@ discard block |
||
| 1001 | 1034 | { |
| 1002 | 1035 | return false; |
| 1003 | 1036 | } |
| 1004 | - } else $altitude = 0; |
|
| 1037 | + } else { |
|
| 1038 | + $altitude = 0; |
|
| 1039 | + } |
|
| 1005 | 1040 | |
| 1006 | 1041 | if ($heading != '') |
| 1007 | 1042 | { |
@@ -1009,7 +1044,9 @@ discard block |
||
| 1009 | 1044 | { |
| 1010 | 1045 | return false; |
| 1011 | 1046 | } |
| 1012 | - } else $heading = 0; |
|
| 1047 | + } else { |
|
| 1048 | + $heading = 0; |
|
| 1049 | + } |
|
| 1013 | 1050 | |
| 1014 | 1051 | if ($groundspeed != '') |
| 1015 | 1052 | { |
@@ -1017,9 +1054,13 @@ discard block |
||
| 1017 | 1054 | { |
| 1018 | 1055 | return false; |
| 1019 | 1056 | } |
| 1020 | - } else $groundspeed = 0; |
|
| 1057 | + } else { |
|
| 1058 | + $groundspeed = 0; |
|
| 1059 | + } |
|
| 1021 | 1060 | date_default_timezone_set('UTC'); |
| 1022 | - if ($date == '') $date = date("Y-m-d H:i:s", time()); |
|
| 1061 | + if ($date == '') { |
|
| 1062 | + $date = date("Y-m-d H:i:s", time()); |
|
| 1063 | + } |
|
| 1023 | 1064 | |
| 1024 | 1065 | |
| 1025 | 1066 | $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
@@ -1064,14 +1105,24 @@ discard block |
||
| 1064 | 1105 | $arrival_airport_country = ''; |
| 1065 | 1106 | |
| 1066 | 1107 | |
| 1067 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1068 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1069 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1070 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1108 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) { |
|
| 1109 | + $squawk = NULL; |
|
| 1110 | + } |
|
| 1111 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) { |
|
| 1112 | + $verticalrate = NULL; |
|
| 1113 | + } |
|
| 1114 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) { |
|
| 1115 | + $groundspeed = 0; |
|
| 1116 | + } |
|
| 1117 | + if ($heading == '' || $Common->isInteger($heading) === false ) { |
|
| 1118 | + $heading = 0; |
|
| 1119 | + } |
|
| 1071 | 1120 | |
| 1072 | 1121 | $query = ''; |
| 1073 | 1122 | if ($globalArchive) { |
| 1074 | - if ($globalDebug) echo '-- Delete previous data -- '; |
|
| 1123 | + if ($globalDebug) { |
|
| 1124 | + echo '-- Delete previous data -- '; |
|
| 1125 | + } |
|
| 1075 | 1126 | $query .= 'DELETE FROM spotter_live WHERE flightaware_id = :flightaware_id;'; |
| 1076 | 1127 | } |
| 1077 | 1128 | |
@@ -1088,10 +1139,14 @@ discard block |
||
| 1088 | 1139 | return "error : ".$e->getMessage(); |
| 1089 | 1140 | } |
| 1090 | 1141 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1091 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1142 | + if ($globalDebug) { |
|
| 1143 | + echo '(Add to SBS archive : '; |
|
| 1144 | + } |
|
| 1092 | 1145 | $SpotterArchive = new SpotterArchive($this->db); |
| 1093 | 1146 | $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
| 1094 | - if ($globalDebug) echo $result.')'; |
|
| 1147 | + if ($globalDebug) { |
|
| 1148 | + echo $result.')'; |
|
| 1149 | + } |
|
| 1095 | 1150 | } |
| 1096 | 1151 | return "success"; |
| 1097 | 1152 | |
@@ -55,7 +55,9 @@ discard block |
||
| 55 | 55 | { |
| 56 | 56 | if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') { |
| 57 | 57 | $image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
| 58 | - } else $image = $spotter_item['image_thumbnail']; |
|
| 58 | + } else { |
|
| 59 | + $image = $spotter_item['image_thumbnail']; |
|
| 60 | + } |
|
| 59 | 61 | |
| 60 | 62 | } |
| 61 | 63 | /* else { |
@@ -68,8 +70,12 @@ discard block |
||
| 68 | 70 | } |
| 69 | 71 | print '<div class="right">'; |
| 70 | 72 | print '<div class="callsign-details">'; |
| 71 | -if ($spotter_item['ident'] != 'Not Available') print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>'; |
|
| 72 | -if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') print '<div class="airline">'.$spotter_item['airline_name'].'</div>'; |
|
| 73 | +if ($spotter_item['ident'] != 'Not Available') { |
|
| 74 | + print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>'; |
|
| 75 | +} |
|
| 76 | +if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') { |
|
| 77 | + print '<div class="airline">'.$spotter_item['airline_name'].'</div>'; |
|
| 78 | +} |
|
| 73 | 79 | print '</div>'; |
| 74 | 80 | if ($spotter_item['departure_airport'] != 'NA' && $spotter_item['arrival_airport'] != 'NA') { |
| 75 | 81 | print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country']; |
@@ -101,21 +107,36 @@ discard block |
||
| 101 | 107 | print '</div>'; |
| 102 | 108 | print '<div id="aircraft">'; |
| 103 | 109 | print '<span>'._("Aircraft").'</span>'; |
| 104 | -if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>'; |
|
| 105 | -if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>'; |
|
| 106 | -if (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>'; |
|
| 107 | -else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name']; |
|
| 110 | +if (isset($spotter_item['aircraft_wiki'])) { |
|
| 111 | + print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>'; |
|
| 112 | +} |
|
| 113 | +if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') { |
|
| 114 | + print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>'; |
|
| 115 | +} |
|
| 116 | +if (isset($spotter_item['aircraft_type'])) { |
|
| 117 | + print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>'; |
|
| 118 | +} else { |
|
| 119 | + print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name']; |
|
| 120 | +} |
|
| 108 | 121 | print '</div>'; |
| 109 | 122 | print '<div id ="altitude"><span>'._("Altitude").'</span>'; |
| 110 | 123 | if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
| 111 | - if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')'; |
|
| 112 | - else print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')'; |
|
| 113 | -} else { |
|
| 114 | - if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')'; |
|
| 115 | - else print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')'; |
|
| 116 | -} |
|
| 124 | + if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') { |
|
| 125 | + print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')'; |
|
| 126 | + } else { |
|
| 127 | + print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')'; |
|
| 128 | + } |
|
| 129 | + } else { |
|
| 130 | + if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') { |
|
| 131 | + print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')'; |
|
| 132 | + } else { |
|
| 133 | + print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')'; |
|
| 134 | + } |
|
| 135 | + } |
|
| 117 | 136 | print '</div>'; |
| 118 | -if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>'; |
|
| 137 | +if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') { |
|
| 138 | + print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>'; |
|
| 139 | +} |
|
| 119 | 140 | print '<div id="speed"><span>'._("Speed").'</span>'; |
| 120 | 141 | if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) { |
| 121 | 142 | print round($spotter_item['ground_speed']*1.15078).' mph'; |
@@ -129,8 +150,11 @@ discard block |
||
| 129 | 150 | print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>'; |
| 130 | 151 | if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') { |
| 131 | 152 | print '<div id="pilot"><span>'._("Pilot").'</span>'; |
| 132 | - if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')'; |
|
| 133 | - else print $spotter_item['pilot_name']; |
|
| 153 | + if (isset($spotter_item['pilot_id'])) { |
|
| 154 | + print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')'; |
|
| 155 | + } else { |
|
| 156 | + print $spotter_item['pilot_name']; |
|
| 157 | + } |
|
| 134 | 158 | print '</div>'; |
| 135 | 159 | } |
| 136 | 160 | |
@@ -158,10 +182,18 @@ discard block |
||
| 158 | 182 | print '</div>'; |
| 159 | 183 | print '</div>'; |
| 160 | 184 | |
| 161 | -if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>'; |
|
| 162 | -if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>'; |
|
| 163 | -if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>'; |
|
| 164 | -if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>'; |
|
| 185 | +if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') { |
|
| 186 | + print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>'; |
|
| 187 | +} |
|
| 188 | +if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') { |
|
| 189 | + print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>'; |
|
| 190 | +} |
|
| 191 | +if (isset($spotter_item['acars']['message'])) { |
|
| 192 | + print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>'; |
|
| 193 | +} |
|
| 194 | +if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) { |
|
| 195 | + print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>'; |
|
| 196 | +} |
|
| 165 | 197 | print '</div>'; |
| 166 | 198 | ?> |
| 167 | 199 | </div> |
| 168 | 200 | \ No newline at end of file |
