Ysurac /
FlightAirMap
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | $page_url = $globalURL.'/tools-geoid'; |
| 14 | 14 | |
| 15 | -$latitude = filter_input(INPUT_POST,'latitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 16 | -$longitude = filter_input(INPUT_POST,'longitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 17 | -$altitude = filter_input(INPUT_POST,'altitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 15 | +$latitude = filter_input(INPUT_POST, 'latitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 16 | +$longitude = filter_input(INPUT_POST, 'longitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 17 | +$altitude = filter_input(INPUT_POST, 'altitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 18 | 18 | |
| 19 | 19 | print '<div class="info column">'; |
| 20 | 20 | print '<h1>'._("Geoid Height Calculator").'</h1>'; |
@@ -51,14 +51,14 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | if ($latitude != '' && $longitude != '') { |
| 53 | 53 | $globalDebug = FALSE; |
| 54 | - $geoid = $GeoidHeight->get($latitude,$longitude); |
|
| 54 | + $geoid = $GeoidHeight->get($latitude, $longitude); |
|
| 55 | 55 | print '<div class="row">'; |
| 56 | 56 | print '<div class="col-md-3 col-md-offset-5">'; |
| 57 | 57 | print '<div class="col-sm-6"><b>Geoid</b></div>'; |
| 58 | 58 | print '<div class="col-sm-6">'.$geoid.'</div>'; |
| 59 | 59 | if ($altitude != '') { |
| 60 | 60 | print '<div class="col-sm-6"><b>AMSL Elevation</b></div>'; |
| 61 | - print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>'; |
|
| 61 | + print '<div class="col-sm-6">'.round($altitude - $geoid, 3).'</div>'; |
|
| 62 | 62 | } |
| 63 | 63 | print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>'; |
| 64 | 64 | if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource; |
@@ -25,20 +25,20 @@ discard block |
||
| 25 | 25 | fclose($fp); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - public static function gunzip($in_file,$out_file_name = '') { |
|
| 28 | + public static function gunzip($in_file, $out_file_name = '') { |
|
| 29 | 29 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 30 | 30 | $buffer_size = 4096; // read 4kb at a time |
| 31 | 31 | if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
| 32 | 32 | if ($in_file != '' && file_exists($in_file)) { |
| 33 | 33 | // PHP version of Ubuntu use gzopen64 instead of gzopen |
| 34 | - if (function_exists('gzopen')) $file = gzopen($in_file,'rb'); |
|
| 35 | - elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb'); |
|
| 34 | + if (function_exists('gzopen')) $file = gzopen($in_file, 'rb'); |
|
| 35 | + elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb'); |
|
| 36 | 36 | else { |
| 37 | 37 | echo 'gzopen not available'; |
| 38 | 38 | die; |
| 39 | 39 | } |
| 40 | 40 | $out_file = fopen($out_file_name, 'wb'); |
| 41 | - while(!gzeof($file)) { |
|
| 41 | + while (!gzeof($file)) { |
|
| 42 | 42 | fwrite($out_file, gzread($file, $buffer_size)); |
| 43 | 43 | } |
| 44 | 44 | fclose($out_file); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | try { |
| 63 | 63 | self::$db_sqlite = new PDO('sqlite:'.$database); |
| 64 | 64 | self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 65 | - } catch(PDOException $e) { |
|
| 65 | + } catch (PDOException $e) { |
|
| 66 | 66 | return "error : ".$e->getMessage(); |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | //$Connection = new Connection(); |
| 78 | 78 | $sth = $Connection->db->prepare($query); |
| 79 | 79 | $sth->execute(array(':source' => $database_file)); |
| 80 | - } catch(PDOException $e) { |
|
| 80 | + } catch (PDOException $e) { |
|
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | try { |
| 89 | 89 | $sth = update_db::$db_sqlite->prepare($query); |
| 90 | 90 | $sth->execute(); |
| 91 | - } catch(PDOException $e) { |
|
| 91 | + } catch (PDOException $e) { |
|
| 92 | 92 | return "error : ".$e->getMessage(); |
| 93 | 93 | } |
| 94 | 94 | //$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
@@ -99,11 +99,11 @@ discard block |
||
| 99 | 99 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 100 | 100 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 101 | 101 | //$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 102 | - $query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
|
| 102 | + $query_dest_values = array(':CallSign' => $values['Callsign'], ':Operator_ICAO' => $values['operator_icao'], ':FromAirport_ICAO' => $values['FromAirportIcao'], ':ToAirport_ICAO' => $values['ToAirportIcao'], ':routestop' => $values['AllStop'], ':source' => $database_file); |
|
| 103 | 103 | $sth_dest->execute($query_dest_values); |
| 104 | 104 | } |
| 105 | 105 | if ($globalTransaction) $Connection->db->commit(); |
| 106 | - } catch(PDOException $e) { |
|
| 106 | + } catch (PDOException $e) { |
|
| 107 | 107 | if ($globalTransaction) $Connection->db->rollBack(); |
| 108 | 108 | return "error : ".$e->getMessage(); |
| 109 | 109 | } |
@@ -119,26 +119,26 @@ discard block |
||
| 119 | 119 | //$Connection = new Connection(); |
| 120 | 120 | $sth = $Connection->db->prepare($query); |
| 121 | 121 | $sth->execute(array(':source' => 'oneworld')); |
| 122 | - } catch(PDOException $e) { |
|
| 122 | + } catch (PDOException $e) { |
|
| 123 | 123 | return "error : ".$e->getMessage(); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | if ($globalDebug) echo " - Add routes to DB -"; |
| 127 | 127 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 128 | 128 | $Spotter = new Spotter(); |
| 129 | - if ($fh = fopen($database_file,"r")) { |
|
| 129 | + if ($fh = fopen($database_file, "r")) { |
|
| 130 | 130 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)'; |
| 131 | 131 | $Connection = new Connection(); |
| 132 | 132 | $sth_dest = $Connection->db->prepare($query_dest); |
| 133 | 133 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 134 | 134 | while (!feof($fh)) { |
| 135 | - $line = fgetcsv($fh,9999,','); |
|
| 135 | + $line = fgetcsv($fh, 9999, ','); |
|
| 136 | 136 | if ($line[0] != '') { |
| 137 | 137 | if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) { |
| 138 | 138 | try { |
| 139 | - $query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld'); |
|
| 139 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[7]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[5], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[6], ':routestop' => '', ':source' => 'oneworld'); |
|
| 140 | 140 | $sth_dest->execute($query_dest_values); |
| 141 | - } catch(PDOException $e) { |
|
| 141 | + } catch (PDOException $e) { |
|
| 142 | 142 | if ($globalTransaction) $Connection->db->rollBack(); |
| 143 | 143 | return "error : ".$e->getMessage(); |
| 144 | 144 | } |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | //$Connection = new Connection(); |
| 161 | 161 | $sth = $Connection->db->prepare($query); |
| 162 | 162 | $sth->execute(array(':source' => 'skyteam')); |
| 163 | - } catch(PDOException $e) { |
|
| 163 | + } catch (PDOException $e) { |
|
| 164 | 164 | return "error : ".$e->getMessage(); |
| 165 | 165 | } |
| 166 | 166 | |
@@ -168,24 +168,24 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 170 | 170 | $Spotter = new Spotter(); |
| 171 | - if ($fh = fopen($database_file,"r")) { |
|
| 171 | + if ($fh = fopen($database_file, "r")) { |
|
| 172 | 172 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)'; |
| 173 | 173 | $Connection = new Connection(); |
| 174 | 174 | $sth_dest = $Connection->db->prepare($query_dest); |
| 175 | 175 | try { |
| 176 | 176 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 177 | 177 | while (!feof($fh)) { |
| 178 | - $line = fgetcsv($fh,9999,','); |
|
| 178 | + $line = fgetcsv($fh, 9999, ','); |
|
| 179 | 179 | if ($line[0] != '') { |
| 180 | - $datebe = explode(' - ',$line[2]); |
|
| 180 | + $datebe = explode(' - ', $line[2]); |
|
| 181 | 181 | if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) { |
| 182 | - $query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam'); |
|
| 182 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam'); |
|
| 183 | 183 | $sth_dest->execute($query_dest_values); |
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | if ($globalTransaction) $Connection->db->commit(); |
| 188 | - } catch(PDOException $e) { |
|
| 188 | + } catch (PDOException $e) { |
|
| 189 | 189 | if ($globalTransaction) $Connection->db->rollBack(); |
| 190 | 190 | return "error : ".$e->getMessage(); |
| 191 | 191 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $Connection = new Connection(); |
| 201 | 201 | $sth = $Connection->db->prepare($query); |
| 202 | 202 | $sth->execute(array(':source' => $database_file)); |
| 203 | - } catch(PDOException $e) { |
|
| 203 | + } catch (PDOException $e) { |
|
| 204 | 204 | return "error : ".$e->getMessage(); |
| 205 | 205 | } |
| 206 | 206 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | $Connection = new Connection(); |
| 209 | 209 | $sth = $Connection->db->prepare($query); |
| 210 | 210 | $sth->execute(array(':source' => $database_file)); |
| 211 | - } catch(PDOException $e) { |
|
| 211 | + } catch (PDOException $e) { |
|
| 212 | 212 | return "error : ".$e->getMessage(); |
| 213 | 213 | } |
| 214 | 214 | |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | try { |
| 218 | 218 | $sth = update_db::$db_sqlite->prepare($query); |
| 219 | 219 | $sth->execute(); |
| 220 | - } catch(PDOException $e) { |
|
| 220 | + } catch (PDOException $e) { |
|
| 221 | 221 | return "error : ".$e->getMessage(); |
| 222 | 222 | } |
| 223 | 223 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -234,15 +234,15 @@ discard block |
||
| 234 | 234 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 235 | 235 | if ($values['UserString4'] == 'M') $type = 'military'; |
| 236 | 236 | else $type = null; |
| 237 | - $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
|
| 237 | + $query_dest_values = array(':LastModified' => $values['LastModified'], ':ModeS' => $values['ModeS'], ':ModeSCountry' => $values['ModeSCountry'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':type' => $type); |
|
| 238 | 238 | $sth_dest->execute($query_dest_values); |
| 239 | 239 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
| 240 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 240 | + $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']); |
|
| 241 | 241 | $sth_dest_owner->execute($query_dest_owner_values); |
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | 244 | if ($globalTransaction) $Connection->db->commit(); |
| 245 | - } catch(PDOException $e) { |
|
| 245 | + } catch (PDOException $e) { |
|
| 246 | 246 | return "error : ".$e->getMessage(); |
| 247 | 247 | } |
| 248 | 248 | |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | $Connection = new Connection(); |
| 253 | 253 | $sth = $Connection->db->prepare($query); |
| 254 | 254 | $sth->execute(array(':source' => $database_file)); |
| 255 | - } catch(PDOException $e) { |
|
| 255 | + } catch (PDOException $e) { |
|
| 256 | 256 | return "error : ".$e->getMessage(); |
| 257 | 257 | } |
| 258 | 258 | return ''; |
@@ -267,11 +267,11 @@ discard block |
||
| 267 | 267 | $Connection = new Connection(); |
| 268 | 268 | $sth = $Connection->db->prepare($query); |
| 269 | 269 | $sth->execute(array(':source' => $database_file)); |
| 270 | - } catch(PDOException $e) { |
|
| 270 | + } catch (PDOException $e) { |
|
| 271 | 271 | return "error : ".$e->getMessage(); |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - if ($fh = fopen($database_file,"r")) { |
|
| 274 | + if ($fh = fopen($database_file, "r")) { |
|
| 275 | 275 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 276 | 276 | $query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 277 | 277 | |
@@ -281,13 +281,13 @@ discard block |
||
| 281 | 281 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 282 | 282 | while (!feof($fh)) { |
| 283 | 283 | $values = array(); |
| 284 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
| 284 | + $line = $Common->hex2str(fgets($fh, 9999)); |
|
| 285 | 285 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 286 | - $values['ModeS'] = substr($line,0,6); |
|
| 287 | - $values['Registration'] = trim(substr($line,69,6)); |
|
| 288 | - $aircraft_name = trim(substr($line,48,6)); |
|
| 286 | + $values['ModeS'] = substr($line, 0, 6); |
|
| 287 | + $values['Registration'] = trim(substr($line, 69, 6)); |
|
| 288 | + $aircraft_name = trim(substr($line, 48, 6)); |
|
| 289 | 289 | // Check if we can find ICAO, else set it to GLID |
| 290 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 290 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 291 | 291 | $search_more = ''; |
| 292 | 292 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 293 | 293 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -299,20 +299,20 @@ discard block |
||
| 299 | 299 | if (isset($result['icao']) && $result['icao'] != '') { |
| 300 | 300 | $values['ICAOTypeCode'] = $result['icao']; |
| 301 | 301 | } |
| 302 | - } catch(PDOException $e) { |
|
| 302 | + } catch (PDOException $e) { |
|
| 303 | 303 | return "error : ".$e->getMessage(); |
| 304 | 304 | } |
| 305 | 305 | if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 306 | 306 | // Add data to db |
| 307 | 307 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
| 308 | 308 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 309 | - $query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
| 309 | + $query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
| 310 | 310 | //print_r($query_dest_values); |
| 311 | 311 | $sth_dest->execute($query_dest_values); |
| 312 | 312 | } |
| 313 | 313 | } |
| 314 | 314 | if ($globalTransaction) $Connection->db->commit(); |
| 315 | - } catch(PDOException $e) { |
|
| 315 | + } catch (PDOException $e) { |
|
| 316 | 316 | return "error : ".$e->getMessage(); |
| 317 | 317 | } |
| 318 | 318 | } |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | $Connection = new Connection(); |
| 323 | 323 | $sth = $Connection->db->prepare($query); |
| 324 | 324 | $sth->execute(array(':source' => $database_file)); |
| 325 | - } catch(PDOException $e) { |
|
| 325 | + } catch (PDOException $e) { |
|
| 326 | 326 | return "error : ".$e->getMessage(); |
| 327 | 327 | } |
| 328 | 328 | return ''; |
@@ -336,11 +336,11 @@ discard block |
||
| 336 | 336 | $Connection = new Connection(); |
| 337 | 337 | $sth = $Connection->db->prepare($query); |
| 338 | 338 | $sth->execute(array(':source' => $database_file)); |
| 339 | - } catch(PDOException $e) { |
|
| 339 | + } catch (PDOException $e) { |
|
| 340 | 340 | return "error : ".$e->getMessage(); |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | - if ($fh = fopen($database_file,"r")) { |
|
| 343 | + if ($fh = fopen($database_file, "r")) { |
|
| 344 | 344 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 345 | 345 | $query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 346 | 346 | |
@@ -348,9 +348,9 @@ discard block |
||
| 348 | 348 | $sth_dest = $Connection->db->prepare($query_dest); |
| 349 | 349 | try { |
| 350 | 350 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 351 | - $tmp = fgetcsv($fh,9999,',',"'"); |
|
| 351 | + $tmp = fgetcsv($fh, 9999, ',', "'"); |
|
| 352 | 352 | while (!feof($fh)) { |
| 353 | - $line = fgetcsv($fh,9999,',',"'"); |
|
| 353 | + $line = fgetcsv($fh, 9999, ',', "'"); |
|
| 354 | 354 | |
| 355 | 355 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 356 | 356 | //print_r($line); |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | $values['ICAOTypeCode'] = ''; |
| 360 | 360 | $aircraft_name = $line[2]; |
| 361 | 361 | // Check if we can find ICAO, else set it to GLID |
| 362 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 362 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 363 | 363 | $search_more = ''; |
| 364 | 364 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 365 | 365 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -368,20 +368,20 @@ discard block |
||
| 368 | 368 | $sth_search->execute(); |
| 369 | 369 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
| 370 | 370 | if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
| 371 | - } catch(PDOException $e) { |
|
| 371 | + } catch (PDOException $e) { |
|
| 372 | 372 | return "error : ".$e->getMessage(); |
| 373 | 373 | } |
| 374 | 374 | //if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 375 | 375 | // Add data to db |
| 376 | 376 | if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') { |
| 377 | 377 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 378 | - $query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'),':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
| 378 | + $query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'), ':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
| 379 | 379 | //print_r($query_dest_values); |
| 380 | 380 | $sth_dest->execute($query_dest_values); |
| 381 | 381 | } |
| 382 | 382 | } |
| 383 | 383 | if ($globalTransaction) $Connection->db->commit(); |
| 384 | - } catch(PDOException $e) { |
|
| 384 | + } catch (PDOException $e) { |
|
| 385 | 385 | return "error : ".$e->getMessage(); |
| 386 | 386 | } |
| 387 | 387 | } |
@@ -391,13 +391,13 @@ discard block |
||
| 391 | 391 | $Connection = new Connection(); |
| 392 | 392 | $sth = $Connection->db->prepare($query); |
| 393 | 393 | $sth->execute(array(':source' => $database_file)); |
| 394 | - } catch(PDOException $e) { |
|
| 394 | + } catch (PDOException $e) { |
|
| 395 | 395 | return "error : ".$e->getMessage(); |
| 396 | 396 | } |
| 397 | 397 | return ''; |
| 398 | 398 | } |
| 399 | 399 | |
| 400 | - public static function retrieve_owner($database_file,$country = 'F') { |
|
| 400 | + public static function retrieve_owner($database_file, $country = 'F') { |
|
| 401 | 401 | global $globalTransaction, $globalMasterSource; |
| 402 | 402 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
| 403 | 403 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;"; |
@@ -405,12 +405,12 @@ discard block |
||
| 405 | 405 | $Connection = new Connection(); |
| 406 | 406 | $sth = $Connection->db->prepare($query); |
| 407 | 407 | $sth->execute(array(':source' => $database_file)); |
| 408 | - } catch(PDOException $e) { |
|
| 408 | + } catch (PDOException $e) { |
|
| 409 | 409 | return "error : ".$e->getMessage(); |
| 410 | 410 | } |
| 411 | 411 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 412 | 412 | $Spotter = new Spotter(); |
| 413 | - if ($fh = fopen($database_file,"r")) { |
|
| 413 | + if ($fh = fopen($database_file, "r")) { |
|
| 414 | 414 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 415 | 415 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 416 | 416 | $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
@@ -420,9 +420,9 @@ discard block |
||
| 420 | 420 | $sth_modes = $Connection->db->prepare($query_modes); |
| 421 | 421 | try { |
| 422 | 422 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 423 | - $tmp = fgetcsv($fh,9999,',','"'); |
|
| 423 | + $tmp = fgetcsv($fh, 9999, ',', '"'); |
|
| 424 | 424 | while (!feof($fh)) { |
| 425 | - $line = fgetcsv($fh,9999,',','"'); |
|
| 425 | + $line = fgetcsv($fh, 9999, ',', '"'); |
|
| 426 | 426 | $values = array(); |
| 427 | 427 | //print_r($line); |
| 428 | 428 | if ($country == 'F') { |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | $values['base'] = $line[4]; |
| 431 | 431 | $values['owner'] = $line[5]; |
| 432 | 432 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 433 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 433 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 434 | 434 | $values['cancel'] = $line[7]; |
| 435 | 435 | } elseif ($country == 'EI') { |
| 436 | 436 | // TODO : add modeS & reg to aircraft_modes |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | $values['base'] = $line[3]; |
| 439 | 439 | $values['owner'] = $line[2]; |
| 440 | 440 | if ($line[1] == '') $values['date_first_reg'] = null; |
| 441 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 441 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1])); |
|
| 442 | 442 | $values['cancel'] = ''; |
| 443 | 443 | $values['modes'] = $line[7]; |
| 444 | 444 | $values['icao'] = $line[8]; |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | $values['base'] = null; |
| 459 | 459 | $values['owner'] = $line[5]; |
| 460 | 460 | if ($line[18] == '') $values['date_first_reg'] = null; |
| 461 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 461 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18])); |
|
| 462 | 462 | $values['cancel'] = ''; |
| 463 | 463 | } elseif ($country == 'VH') { |
| 464 | 464 | // TODO : add modeS & reg to aircraft_modes |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | $values['base'] = null; |
| 467 | 467 | $values['owner'] = $line[12]; |
| 468 | 468 | if ($line[28] == '') $values['date_first_reg'] = null; |
| 469 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 469 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28])); |
|
| 470 | 470 | |
| 471 | 471 | $values['cancel'] = $line[39]; |
| 472 | 472 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -486,28 +486,28 @@ discard block |
||
| 486 | 486 | $values['base'] = null; |
| 487 | 487 | $values['owner'] = $line[8]; |
| 488 | 488 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 489 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 489 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 490 | 490 | $values['cancel'] = ''; |
| 491 | 491 | } elseif ($country == 'PP') { |
| 492 | 492 | $values['registration'] = $line[0]; |
| 493 | 493 | $values['base'] = null; |
| 494 | 494 | $values['owner'] = $line[4]; |
| 495 | 495 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 496 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 496 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 497 | 497 | $values['cancel'] = $line[7]; |
| 498 | 498 | } elseif ($country == 'E7') { |
| 499 | 499 | $values['registration'] = $line[0]; |
| 500 | 500 | $values['base'] = null; |
| 501 | 501 | $values['owner'] = $line[4]; |
| 502 | 502 | if ($line[5] == '') $values['date_first_reg'] = null; |
| 503 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 503 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 504 | 504 | $values['cancel'] = ''; |
| 505 | 505 | } elseif ($country == '8Q') { |
| 506 | 506 | $values['registration'] = $line[0]; |
| 507 | 507 | $values['base'] = null; |
| 508 | 508 | $values['owner'] = $line[3]; |
| 509 | 509 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 510 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 510 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 511 | 511 | $values['cancel'] = ''; |
| 512 | 512 | } elseif ($country == 'ZK') { |
| 513 | 513 | $values['registration'] = $line[0]; |
@@ -521,18 +521,18 @@ discard block |
||
| 521 | 521 | $values['registration'] = $line[0]; |
| 522 | 522 | $values['base'] = null; |
| 523 | 523 | $values['owner'] = $line[6]; |
| 524 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 525 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 524 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 525 | + $values['cancel'] = date("Y-m-d", strtotime($line[8])); |
|
| 526 | 526 | $values['modes'] = $line[4]; |
| 527 | 527 | $values['icao'] = $line[10]; |
| 528 | 528 | } elseif ($country == 'OY') { |
| 529 | 529 | $values['registration'] = $line[0]; |
| 530 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 530 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[4])); |
|
| 531 | 531 | $values['modes'] = $line[5]; |
| 532 | 532 | $values['icao'] = $line[6]; |
| 533 | 533 | } elseif ($country == 'PH') { |
| 534 | 534 | $values['registration'] = $line[0]; |
| 535 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 535 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[3])); |
|
| 536 | 536 | $values['modes'] = $line[4]; |
| 537 | 537 | $values['icao'] = $line[5]; |
| 538 | 538 | } elseif ($country == 'OM' || $country == 'TF') { |
@@ -543,17 +543,17 @@ discard block |
||
| 543 | 543 | $values['cancel'] = ''; |
| 544 | 544 | } |
| 545 | 545 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
| 546 | - $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
|
| 546 | + $query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file); |
|
| 547 | 547 | $sth_dest->execute($query_dest_values); |
| 548 | 548 | } |
| 549 | 549 | if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') { |
| 550 | 550 | $modescountry = $Spotter->countryFromAircraftRegistration($values['registration']); |
| 551 | - $query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file); |
|
| 551 | + $query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file); |
|
| 552 | 552 | $sth_modes->execute($query_modes_values); |
| 553 | 553 | } |
| 554 | 554 | } |
| 555 | 555 | if ($globalTransaction) $Connection->db->commit(); |
| 556 | - } catch(PDOException $e) { |
|
| 556 | + } catch (PDOException $e) { |
|
| 557 | 557 | return "error : ".$e->getMessage(); |
| 558 | 558 | } |
| 559 | 559 | } |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 692 | 692 | |
| 693 | 693 | $i = 0; |
| 694 | - while($row = sparql_fetch_array($result)) |
|
| 694 | + while ($row = sparql_fetch_array($result)) |
|
| 695 | 695 | { |
| 696 | 696 | if ($i >= 1) { |
| 697 | 697 | //print_r($row); |
@@ -711,33 +711,33 @@ discard block |
||
| 711 | 711 | $row['image'] = ''; |
| 712 | 712 | $row['image_thumb'] = ''; |
| 713 | 713 | } else { |
| 714 | - $image = str_replace(' ','_',$row['image']); |
|
| 714 | + $image = str_replace(' ', '_', $row['image']); |
|
| 715 | 715 | $digest = md5($image); |
| 716 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image; |
|
| 717 | - $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder; |
|
| 718 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image; |
|
| 719 | - $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder; |
|
| 716 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image; |
|
| 717 | + $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder; |
|
| 718 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image; |
|
| 719 | + $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder; |
|
| 720 | 720 | } |
| 721 | 721 | |
| 722 | - $country = explode('-',$row['country']); |
|
| 722 | + $country = explode('-', $row['country']); |
|
| 723 | 723 | $row['country'] = $country[0]; |
| 724 | 724 | |
| 725 | 725 | $row['type'] = trim($row['type']); |
| 726 | - if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) { |
|
| 726 | + if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) { |
|
| 727 | 727 | $row['type'] = 'military'; |
| 728 | 728 | } elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') { |
| 729 | 729 | $row['type'] = 'small_airport'; |
| 730 | 730 | } |
| 731 | 731 | |
| 732 | - $row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city']))); |
|
| 733 | - $query_dest_values = array(':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => round($row['altitude']),':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']); |
|
| 732 | + $row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city']))); |
|
| 733 | + $query_dest_values = array(':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => round($row['altitude']), ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']); |
|
| 734 | 734 | //print_r($query_dest_values); |
| 735 | 735 | |
| 736 | 736 | if ($row['icao'] != '') { |
| 737 | 737 | try { |
| 738 | 738 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao'); |
| 739 | 739 | $sth->execute(array(':icao' => $row['icao'])); |
| 740 | - } catch(PDOException $e) { |
|
| 740 | + } catch (PDOException $e) { |
|
| 741 | 741 | return "error : ".$e->getMessage(); |
| 742 | 742 | } |
| 743 | 743 | if ($sth->fetchColumn() > 0) { |
@@ -745,15 +745,15 @@ discard block |
||
| 745 | 745 | $query = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 746 | 746 | try { |
| 747 | 747 | $sth = $Connection->db->prepare($query); |
| 748 | - $sth->execute(array(':icao' => $row['icao'],':type' => $row['type'])); |
|
| 749 | - } catch(PDOException $e) { |
|
| 748 | + $sth->execute(array(':icao' => $row['icao'], ':type' => $row['type'])); |
|
| 749 | + } catch (PDOException $e) { |
|
| 750 | 750 | return "error : ".$e->getMessage(); |
| 751 | 751 | } |
| 752 | 752 | echo $row['icao'].' : '.$row['type']."\n"; |
| 753 | 753 | } else { |
| 754 | 754 | try { |
| 755 | 755 | $sth_dest->execute($query_dest_values); |
| 756 | - } catch(PDOException $e) { |
|
| 756 | + } catch (PDOException $e) { |
|
| 757 | 757 | return "error : ".$e->getMessage(); |
| 758 | 758 | } |
| 759 | 759 | } |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | echo "Download data from ourairports.com...\n"; |
| 805 | 805 | $delimiter = ','; |
| 806 | 806 | $out_file = $tmp_dir.'airports.csv'; |
| 807 | - update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
|
| 807 | + update_db::download('http://ourairports.com/data/airports.csv', $out_file); |
|
| 808 | 808 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 809 | 809 | echo "Add data from ourairports.com...\n"; |
| 810 | 810 | |
@@ -815,33 +815,33 @@ discard block |
||
| 815 | 815 | //$Connection->db->beginTransaction(); |
| 816 | 816 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 817 | 817 | { |
| 818 | - if(!$header) $header = $row; |
|
| 818 | + if (!$header) $header = $row; |
|
| 819 | 819 | else { |
| 820 | 820 | $data = array(); |
| 821 | 821 | $data = array_combine($header, $row); |
| 822 | 822 | try { |
| 823 | 823 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao'); |
| 824 | 824 | $sth->execute(array(':icao' => $data['ident'])); |
| 825 | - } catch(PDOException $e) { |
|
| 825 | + } catch (PDOException $e) { |
|
| 826 | 826 | return "error : ".$e->getMessage(); |
| 827 | 827 | } |
| 828 | 828 | if ($sth->fetchColumn() > 0) { |
| 829 | 829 | $query = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 830 | 830 | try { |
| 831 | 831 | $sth = $Connection->db->prepare($query); |
| 832 | - $sth->execute(array(':icao' => $data['ident'],':type' => $data['type'])); |
|
| 833 | - } catch(PDOException $e) { |
|
| 832 | + $sth->execute(array(':icao' => $data['ident'], ':type' => $data['type'])); |
|
| 833 | + } catch (PDOException $e) { |
|
| 834 | 834 | return "error : ".$e->getMessage(); |
| 835 | 835 | } |
| 836 | 836 | } else { |
| 837 | 837 | if ($data['gps_code'] == $data['ident']) { |
| 838 | 838 | $query = "INSERT INTO airport (name,city,country,iata,icao,latitude,longitude,altitude,type,home_link,wikipedia_link) |
| 839 | 839 | VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)"; |
| 840 | - $query_values = array(':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => round($data['elevation_ft']),':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']); |
|
| 840 | + $query_values = array(':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => round($data['elevation_ft']), ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']); |
|
| 841 | 841 | try { |
| 842 | 842 | $sth = $Connection->db->prepare($query); |
| 843 | 843 | $sth->execute($query_values); |
| 844 | - } catch(PDOException $e) { |
|
| 844 | + } catch (PDOException $e) { |
|
| 845 | 845 | return "error : ".$e->getMessage(); |
| 846 | 846 | } |
| 847 | 847 | $i++; |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | |
| 857 | 857 | echo "Download data from another free database...\n"; |
| 858 | 858 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
| 859 | - update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
|
| 859 | + update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file); |
|
| 860 | 860 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 861 | 861 | update_db::unzip($out_file); |
| 862 | 862 | $header = NULL; |
@@ -868,15 +868,15 @@ discard block |
||
| 868 | 868 | //$Connection->db->beginTransaction(); |
| 869 | 869 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 870 | 870 | { |
| 871 | - if(!$header) $header = $row; |
|
| 871 | + if (!$header) $header = $row; |
|
| 872 | 872 | else { |
| 873 | 873 | $data = $row; |
| 874 | 874 | |
| 875 | 875 | $query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao'; |
| 876 | 876 | try { |
| 877 | 877 | $sth = $Connection->db->prepare($query); |
| 878 | - $sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4])))); |
|
| 879 | - } catch(PDOException $e) { |
|
| 878 | + $sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4])))); |
|
| 879 | + } catch (PDOException $e) { |
|
| 880 | 880 | return "error : ".$e->getMessage(); |
| 881 | 881 | } |
| 882 | 882 | } |
@@ -890,15 +890,15 @@ discard block |
||
| 890 | 890 | try { |
| 891 | 891 | $sth = $Connection->db->prepare("SELECT icao FROM airport WHERE name LIKE '%Air Base%'"); |
| 892 | 892 | $sth->execute(); |
| 893 | - } catch(PDOException $e) { |
|
| 893 | + } catch (PDOException $e) { |
|
| 894 | 894 | return "error : ".$e->getMessage(); |
| 895 | 895 | } |
| 896 | 896 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 897 | 897 | $query2 = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 898 | 898 | try { |
| 899 | 899 | $sth2 = $Connection->db->prepare($query2); |
| 900 | - $sth2->execute(array(':icao' => $row['icao'],':type' => 'military')); |
|
| 901 | - } catch(PDOException $e) { |
|
| 900 | + $sth2->execute(array(':icao' => $row['icao'], ':type' => 'military')); |
|
| 901 | + } catch (PDOException $e) { |
|
| 902 | 902 | return "error : ".$e->getMessage(); |
| 903 | 903 | } |
| 904 | 904 | } |
@@ -919,7 +919,7 @@ discard block |
||
| 919 | 919 | $Connection = new Connection(); |
| 920 | 920 | $sth = $Connection->db->prepare($query); |
| 921 | 921 | $sth->execute(array(':source' => 'translation.csv')); |
| 922 | - } catch(PDOException $e) { |
|
| 922 | + } catch (PDOException $e) { |
|
| 923 | 923 | return "error : ".$e->getMessage(); |
| 924 | 924 | } |
| 925 | 925 | |
@@ -936,7 +936,7 @@ discard block |
||
| 936 | 936 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 937 | 937 | { |
| 938 | 938 | $i++; |
| 939 | - if($i > 12) { |
|
| 939 | + if ($i > 12) { |
|
| 940 | 940 | $data = $row; |
| 941 | 941 | $operator = $data[2]; |
| 942 | 942 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | //echo substr($operator, 0, 2)."\n";; |
| 945 | 945 | if (count($airline_array) > 0) { |
| 946 | 946 | //print_r($airline_array); |
| 947 | - $operator = $airline_array[0]['icao'].substr($operator,2); |
|
| 947 | + $operator = $airline_array[0]['icao'].substr($operator, 2); |
|
| 948 | 948 | } |
| 949 | 949 | } |
| 950 | 950 | |
@@ -952,14 +952,14 @@ discard block |
||
| 952 | 952 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
| 953 | 953 | $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
| 954 | 954 | if (count($airline_array) > 0) { |
| 955 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 955 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2); |
|
| 956 | 956 | } |
| 957 | 957 | } |
| 958 | 958 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 959 | 959 | try { |
| 960 | 960 | $sth = $Connection->db->prepare($query); |
| 961 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 962 | - } catch(PDOException $e) { |
|
| 961 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 962 | + } catch (PDOException $e) { |
|
| 963 | 963 | return "error : ".$e->getMessage(); |
| 964 | 964 | } |
| 965 | 965 | } |
@@ -979,7 +979,7 @@ discard block |
||
| 979 | 979 | $Connection = new Connection(); |
| 980 | 980 | $sth = $Connection->db->prepare($query); |
| 981 | 981 | $sth->execute(array(':source' => 'website_fam')); |
| 982 | - } catch(PDOException $e) { |
|
| 982 | + } catch (PDOException $e) { |
|
| 983 | 983 | return "error : ".$e->getMessage(); |
| 984 | 984 | } |
| 985 | 985 | |
@@ -999,8 +999,8 @@ discard block |
||
| 999 | 999 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 1000 | 1000 | try { |
| 1001 | 1001 | $sth = $Connection->db->prepare($query); |
| 1002 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 1003 | - } catch(PDOException $e) { |
|
| 1002 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 1003 | + } catch (PDOException $e) { |
|
| 1004 | 1004 | return "error : ".$e->getMessage(); |
| 1005 | 1005 | } |
| 1006 | 1006 | } |
@@ -1023,7 +1023,7 @@ discard block |
||
| 1023 | 1023 | $Connection = new Connection(); |
| 1024 | 1024 | $sth = $Connection->db->prepare($query); |
| 1025 | 1025 | $sth->execute(array(':source' => 'website_faa')); |
| 1026 | - } catch(PDOException $e) { |
|
| 1026 | + } catch (PDOException $e) { |
|
| 1027 | 1027 | return "error : ".$e->getMessage(); |
| 1028 | 1028 | } |
| 1029 | 1029 | |
@@ -1032,7 +1032,7 @@ discard block |
||
| 1032 | 1032 | $Connection = new Connection(); |
| 1033 | 1033 | $sth = $Connection->db->prepare($query); |
| 1034 | 1034 | $sth->execute(array(':source' => 'website_faa')); |
| 1035 | - } catch(PDOException $e) { |
|
| 1035 | + } catch (PDOException $e) { |
|
| 1036 | 1036 | return "error : ".$e->getMessage(); |
| 1037 | 1037 | } |
| 1038 | 1038 | |
@@ -1049,8 +1049,8 @@ discard block |
||
| 1049 | 1049 | $query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1'; |
| 1050 | 1050 | try { |
| 1051 | 1051 | $sths = $Connection->db->prepare($query_search); |
| 1052 | - $sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa')); |
|
| 1053 | - } catch(PDOException $e) { |
|
| 1052 | + $sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa')); |
|
| 1053 | + } catch (PDOException $e) { |
|
| 1054 | 1054 | return "error s : ".$e->getMessage(); |
| 1055 | 1055 | } |
| 1056 | 1056 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
@@ -1063,8 +1063,8 @@ discard block |
||
| 1063 | 1063 | //} |
| 1064 | 1064 | try { |
| 1065 | 1065 | $sthi = $Connection->db->prepare($queryi); |
| 1066 | - $sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode'])); |
|
| 1067 | - } catch(PDOException $e) { |
|
| 1066 | + $sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode'])); |
|
| 1067 | + } catch (PDOException $e) { |
|
| 1068 | 1068 | return "error u : ".$e->getMessage(); |
| 1069 | 1069 | } |
| 1070 | 1070 | } else { |
@@ -1072,7 +1072,7 @@ discard block |
||
| 1072 | 1072 | try { |
| 1073 | 1073 | $sthsm = $Connection->db->prepare($query_search_mfr); |
| 1074 | 1074 | $sthsm->execute(array(':mfr' => $data[2])); |
| 1075 | - } catch(PDOException $e) { |
|
| 1075 | + } catch (PDOException $e) { |
|
| 1076 | 1076 | return "error mfr : ".$e->getMessage(); |
| 1077 | 1077 | } |
| 1078 | 1078 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
@@ -1082,8 +1082,8 @@ discard block |
||
| 1082 | 1082 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
| 1083 | 1083 | try { |
| 1084 | 1084 | $sthf = $Connection->db->prepare($queryf); |
| 1085 | - $sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa')); |
|
| 1086 | - } catch(PDOException $e) { |
|
| 1085 | + $sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa')); |
|
| 1086 | + } catch (PDOException $e) { |
|
| 1087 | 1087 | return "error f : ".$e->getMessage(); |
| 1088 | 1088 | } |
| 1089 | 1089 | } |
@@ -1093,13 +1093,13 @@ discard block |
||
| 1093 | 1093 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 1094 | 1094 | try { |
| 1095 | 1095 | $sth = $Connection->db->prepare($query); |
| 1096 | - $sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa')); |
|
| 1097 | - } catch(PDOException $e) { |
|
| 1096 | + $sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa')); |
|
| 1097 | + } catch (PDOException $e) { |
|
| 1098 | 1098 | return "error i : ".$e->getMessage(); |
| 1099 | 1099 | } |
| 1100 | 1100 | } |
| 1101 | 1101 | } |
| 1102 | - if ($i % 90 == 0) { |
|
| 1102 | + if ($i%90 == 0) { |
|
| 1103 | 1103 | if ($globalTransaction) $Connection->db->commit(); |
| 1104 | 1104 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1105 | 1105 | } |
@@ -1118,7 +1118,7 @@ discard block |
||
| 1118 | 1118 | $Connection = new Connection(); |
| 1119 | 1119 | $sth = $Connection->db->prepare($query); |
| 1120 | 1120 | $sth->execute(array(':source' => 'website_fam')); |
| 1121 | - } catch(PDOException $e) { |
|
| 1121 | + } catch (PDOException $e) { |
|
| 1122 | 1122 | return "error : ".$e->getMessage(); |
| 1123 | 1123 | } |
| 1124 | 1124 | |
@@ -1139,8 +1139,8 @@ discard block |
||
| 1139 | 1139 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
| 1140 | 1140 | try { |
| 1141 | 1141 | $sth = $Connection->db->prepare($query); |
| 1142 | - $sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam')); |
|
| 1143 | - } catch(PDOException $e) { |
|
| 1142 | + $sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam')); |
|
| 1143 | + } catch (PDOException $e) { |
|
| 1144 | 1144 | return "error : ".$e->getMessage(); |
| 1145 | 1145 | } |
| 1146 | 1146 | } |
@@ -1159,7 +1159,7 @@ discard block |
||
| 1159 | 1159 | $Connection = new Connection(); |
| 1160 | 1160 | $sth = $Connection->db->prepare($query); |
| 1161 | 1161 | $sth->execute(array(':source' => 'website_fam')); |
| 1162 | - } catch(PDOException $e) { |
|
| 1162 | + } catch (PDOException $e) { |
|
| 1163 | 1163 | return "error : ".$e->getMessage(); |
| 1164 | 1164 | } |
| 1165 | 1165 | |
@@ -1175,8 +1175,8 @@ discard block |
||
| 1175 | 1175 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)'; |
| 1176 | 1176 | try { |
| 1177 | 1177 | $sth = $Connection->db->prepare($query); |
| 1178 | - $sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1179 | - } catch(PDOException $e) { |
|
| 1178 | + $sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1179 | + } catch (PDOException $e) { |
|
| 1180 | 1180 | print_r($data); |
| 1181 | 1181 | return "error : ".$e->getMessage(); |
| 1182 | 1182 | } |
@@ -1196,7 +1196,7 @@ discard block |
||
| 1196 | 1196 | $Connection = new Connection(); |
| 1197 | 1197 | $sth = $Connection->db->prepare($query); |
| 1198 | 1198 | $sth->execute(array(':source' => 'website_fam')); |
| 1199 | - } catch(PDOException $e) { |
|
| 1199 | + } catch (PDOException $e) { |
|
| 1200 | 1200 | return "error : ".$e->getMessage(); |
| 1201 | 1201 | } |
| 1202 | 1202 | $delimiter = "\t"; |
@@ -1211,9 +1211,9 @@ discard block |
||
| 1211 | 1211 | $query = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign,:Operator_ICAO,:FromAirport_ICAO,:FromAirport_Time,:ToAirport_ICAO,:ToAirport_Time,:RouteStop,:source)'; |
| 1212 | 1212 | try { |
| 1213 | 1213 | $sth = $Connection->db->prepare($query); |
| 1214 | - $sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam')); |
|
| 1215 | - } catch(PDOException $e) { |
|
| 1216 | - if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
| 1214 | + $sth->execute(array(':CallSign' => $data[0], ':Operator_ICAO' => $data[1], ':FromAirport_ICAO' => $data[2], ':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4], ':ToAirport_Time' => $data[5], ':RouteStop' => $data[6], ':source' => 'website_fam')); |
|
| 1215 | + } catch (PDOException $e) { |
|
| 1216 | + if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',', $data); |
|
| 1217 | 1217 | } |
| 1218 | 1218 | } |
| 1219 | 1219 | $i++; |
@@ -1231,7 +1231,7 @@ discard block |
||
| 1231 | 1231 | $Connection = new Connection(); |
| 1232 | 1232 | $sth = $Connection->db->prepare($query); |
| 1233 | 1233 | $sth->execute(); |
| 1234 | - } catch(PDOException $e) { |
|
| 1234 | + } catch (PDOException $e) { |
|
| 1235 | 1235 | return "error : ".$e->getMessage(); |
| 1236 | 1236 | } |
| 1237 | 1237 | |
@@ -1252,8 +1252,8 @@ discard block |
||
| 1252 | 1252 | $query = 'INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,length,gross_tonnage,dead_weight,width,country,engine_power,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:length,:gross_tonnage,:dead_weight,:width,:country,:engine_power,:type)'; |
| 1253 | 1253 | try { |
| 1254 | 1254 | $sth = $Connection->db->prepare($query); |
| 1255 | - $sth->execute(array(':mmsi' => $data[0],':imo' => $data[1],':call_sign' => $data[2],':ship_name' => $data[3], ':length' => $data[4],':gross_tonnage' => $data[5],':dead_weight' => $data[6],':width' => $data[7],':country' => $data[8],':engine_power' => $data[9],':type' => $data[10])); |
|
| 1256 | - } catch(PDOException $e) { |
|
| 1255 | + $sth->execute(array(':mmsi' => $data[0], ':imo' => $data[1], ':call_sign' => $data[2], ':ship_name' => $data[3], ':length' => $data[4], ':gross_tonnage' => $data[5], ':dead_weight' => $data[6], ':width' => $data[7], ':country' => $data[8], ':engine_power' => $data[9], ':type' => $data[10])); |
|
| 1256 | + } catch (PDOException $e) { |
|
| 1257 | 1257 | return "error : ".$e->getMessage(); |
| 1258 | 1258 | } |
| 1259 | 1259 | } |
@@ -1272,7 +1272,7 @@ discard block |
||
| 1272 | 1272 | $Connection = new Connection(); |
| 1273 | 1273 | $sth = $Connection->db->prepare($query); |
| 1274 | 1274 | $sth->execute(); |
| 1275 | - } catch(PDOException $e) { |
|
| 1275 | + } catch (PDOException $e) { |
|
| 1276 | 1276 | return "error : ".$e->getMessage(); |
| 1277 | 1277 | } |
| 1278 | 1278 | |
@@ -1288,7 +1288,7 @@ discard block |
||
| 1288 | 1288 | try { |
| 1289 | 1289 | $sth = $Connection->db->prepare($query); |
| 1290 | 1290 | $sth->execute(array(':icao' => $icao)); |
| 1291 | - } catch(PDOException $e) { |
|
| 1291 | + } catch (PDOException $e) { |
|
| 1292 | 1292 | return "error : ".$e->getMessage(); |
| 1293 | 1293 | } |
| 1294 | 1294 | } |
@@ -1299,7 +1299,7 @@ discard block |
||
| 1299 | 1299 | return ''; |
| 1300 | 1300 | } |
| 1301 | 1301 | |
| 1302 | - public static function tle($filename,$tletype) { |
|
| 1302 | + public static function tle($filename, $tletype) { |
|
| 1303 | 1303 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1304 | 1304 | global $tmp_dir, $globalTransaction; |
| 1305 | 1305 | //$Spotter = new Spotter(); |
@@ -1309,7 +1309,7 @@ discard block |
||
| 1309 | 1309 | $Connection = new Connection(); |
| 1310 | 1310 | $sth = $Connection->db->prepare($query); |
| 1311 | 1311 | $sth->execute(array(':source' => $filename)); |
| 1312 | - } catch(PDOException $e) { |
|
| 1312 | + } catch (PDOException $e) { |
|
| 1313 | 1313 | return "error : ".$e->getMessage(); |
| 1314 | 1314 | } |
| 1315 | 1315 | |
@@ -1334,8 +1334,8 @@ discard block |
||
| 1334 | 1334 | $query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)'; |
| 1335 | 1335 | try { |
| 1336 | 1336 | $sth = $Connection->db->prepare($query); |
| 1337 | - $sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename)); |
|
| 1338 | - } catch(PDOException $e) { |
|
| 1337 | + $sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename)); |
|
| 1338 | + } catch (PDOException $e) { |
|
| 1339 | 1339 | return "error : ".$e->getMessage(); |
| 1340 | 1340 | } |
| 1341 | 1341 | |
@@ -1355,28 +1355,28 @@ discard block |
||
| 1355 | 1355 | */ |
| 1356 | 1356 | private static function table2array($data) { |
| 1357 | 1357 | $html = str_get_html($data); |
| 1358 | - $tabledata=array(); |
|
| 1359 | - foreach($html->find('tr') as $element) |
|
| 1358 | + $tabledata = array(); |
|
| 1359 | + foreach ($html->find('tr') as $element) |
|
| 1360 | 1360 | { |
| 1361 | 1361 | $td = array(); |
| 1362 | - foreach( $element->find('th') as $row) |
|
| 1362 | + foreach ($element->find('th') as $row) |
|
| 1363 | 1363 | { |
| 1364 | 1364 | $td [] = trim($row->plaintext); |
| 1365 | 1365 | } |
| 1366 | - $td=array_filter($td); |
|
| 1366 | + $td = array_filter($td); |
|
| 1367 | 1367 | $tabledata[] = $td; |
| 1368 | 1368 | |
| 1369 | 1369 | $td = array(); |
| 1370 | 1370 | $tdi = array(); |
| 1371 | - foreach( $element->find('td') as $row) |
|
| 1371 | + foreach ($element->find('td') as $row) |
|
| 1372 | 1372 | { |
| 1373 | 1373 | $td [] = trim($row->plaintext); |
| 1374 | 1374 | $tdi [] = trim($row->innertext); |
| 1375 | 1375 | } |
| 1376 | - $td=array_filter($td); |
|
| 1377 | - $tdi=array_filter($tdi); |
|
| 1376 | + $td = array_filter($td); |
|
| 1377 | + $tdi = array_filter($tdi); |
|
| 1378 | 1378 | // $tabledata[]=array_merge($td,$tdi); |
| 1379 | - $tabledata[]=$td; |
|
| 1379 | + $tabledata[] = $td; |
|
| 1380 | 1380 | } |
| 1381 | 1381 | return(array_filter($tabledata)); |
| 1382 | 1382 | } |
@@ -1449,13 +1449,13 @@ discard block |
||
| 1449 | 1449 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1450 | 1450 | { |
| 1451 | 1451 | $i++; |
| 1452 | - if($i > 3 && count($row) > 2) { |
|
| 1452 | + if ($i > 3 && count($row) > 2) { |
|
| 1453 | 1453 | $data = array_values(array_filter($row)); |
| 1454 | 1454 | $cntdata = count($data); |
| 1455 | 1455 | if ($cntdata > 10) { |
| 1456 | 1456 | $value = $data[9]; |
| 1457 | 1457 | |
| 1458 | - for ($i =10;$i < $cntdata;$i++) { |
|
| 1458 | + for ($i = 10; $i < $cntdata; $i++) { |
|
| 1459 | 1459 | $value .= ' '.$data[$i]; |
| 1460 | 1460 | } |
| 1461 | 1461 | $data[9] = $value; |
@@ -1465,8 +1465,8 @@ discard block |
||
| 1465 | 1465 | $query = 'INSERT INTO waypoints (name_begin,latitude_begin,longitude_begin,name_end,latitude_end,longitude_end,high,base,top,segment_name) VALUES (:name_begin, :latitude_begin, :longitude_begin, :name_end, :latitude_end, :longitude_end, :high, :base, :top, :segment_name)'; |
| 1466 | 1466 | try { |
| 1467 | 1467 | $sth = $Connection->db->prepare($query); |
| 1468 | - $sth->execute(array(':name_begin' => $data[0],':latitude_begin' => $data[1],':longitude_begin' => $data[2],':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9])); |
|
| 1469 | - } catch(PDOException $e) { |
|
| 1468 | + $sth->execute(array(':name_begin' => $data[0], ':latitude_begin' => $data[1], ':longitude_begin' => $data[2], ':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9])); |
|
| 1469 | + } catch (PDOException $e) { |
|
| 1470 | 1470 | return "error : ".$e->getMessage(); |
| 1471 | 1471 | } |
| 1472 | 1472 | } |
@@ -1487,7 +1487,7 @@ discard block |
||
| 1487 | 1487 | $Connection = new Connection(); |
| 1488 | 1488 | $sth = $Connection->db->prepare($query); |
| 1489 | 1489 | $sth->execute(); |
| 1490 | - } catch(PDOException $e) { |
|
| 1490 | + } catch (PDOException $e) { |
|
| 1491 | 1491 | return "error : ".$e->getMessage(); |
| 1492 | 1492 | } |
| 1493 | 1493 | |
@@ -1499,12 +1499,12 @@ discard block |
||
| 1499 | 1499 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1500 | 1500 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1501 | 1501 | { |
| 1502 | - if(count($row) > 1) { |
|
| 1502 | + if (count($row) > 1) { |
|
| 1503 | 1503 | $query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')"; |
| 1504 | 1504 | try { |
| 1505 | 1505 | $sth = $Connection->db->prepare($query); |
| 1506 | - $sth->execute(array(':name' => $row[1],':icao' => $row[0])); |
|
| 1507 | - } catch(PDOException $e) { |
|
| 1506 | + $sth->execute(array(':name' => $row[1], ':icao' => $row[0])); |
|
| 1507 | + } catch (PDOException $e) { |
|
| 1508 | 1508 | return "error : ".$e->getMessage(); |
| 1509 | 1509 | } |
| 1510 | 1510 | } |
@@ -1524,21 +1524,21 @@ discard block |
||
| 1524 | 1524 | try { |
| 1525 | 1525 | $sth = $Connection->db->prepare($query); |
| 1526 | 1526 | $sth->execute(); |
| 1527 | - } catch(PDOException $e) { |
|
| 1527 | + } catch (PDOException $e) { |
|
| 1528 | 1528 | return "error : ".$e->getMessage(); |
| 1529 | 1529 | } |
| 1530 | 1530 | } |
| 1531 | 1531 | |
| 1532 | 1532 | |
| 1533 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1533 | + if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1534 | 1534 | else { |
| 1535 | - update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1535 | + update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1536 | 1536 | $query = "CREATE EXTENSION postgis"; |
| 1537 | - $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
|
| 1537 | + $Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']); |
|
| 1538 | 1538 | try { |
| 1539 | 1539 | $sth = $Connection->db->prepare($query); |
| 1540 | 1540 | $sth->execute(); |
| 1541 | - } catch(PDOException $e) { |
|
| 1541 | + } catch (PDOException $e) { |
|
| 1542 | 1542 | return "error : ".$e->getMessage(); |
| 1543 | 1543 | } |
| 1544 | 1544 | } |
@@ -1551,7 +1551,7 @@ discard block |
||
| 1551 | 1551 | include_once('class.create_db.php'); |
| 1552 | 1552 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1553 | 1553 | if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
| 1554 | - update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
|
| 1554 | + update_db::download('http://data.flightairmap.fr/data/notam.txt.gz', $tmp_dir.'notam.txt.gz'); |
|
| 1555 | 1555 | $error = ''; |
| 1556 | 1556 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1557 | 1557 | if ($globalDebug) echo "Gunzip..."; |
@@ -1583,14 +1583,14 @@ discard block |
||
| 1583 | 1583 | try { |
| 1584 | 1584 | $sth = $Connection->db->prepare($query); |
| 1585 | 1585 | $sth->execute(); |
| 1586 | - } catch(PDOException $e) { |
|
| 1586 | + } catch (PDOException $e) { |
|
| 1587 | 1587 | echo "error : ".$e->getMessage(); |
| 1588 | 1588 | } |
| 1589 | 1589 | } |
| 1590 | 1590 | if ($globalDBdriver == 'mysql') { |
| 1591 | - update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1591 | + update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1592 | 1592 | } else { |
| 1593 | - update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1593 | + update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1594 | 1594 | } |
| 1595 | 1595 | $error = create_db::import_file($tmp_dir.'countries.sql'); |
| 1596 | 1596 | return $error; |
@@ -1603,7 +1603,7 @@ discard block |
||
| 1603 | 1603 | // update_db::unzip($tmp_dir.'AptNav.zip'); |
| 1604 | 1604 | // update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz'); |
| 1605 | 1605 | // update_db::download('http://sourceforge.net/p/flightgear/fgdata/ci/next/tree/Navaids/awy.dat.gz?format=raw',$tmp_dir.'awy.dat.gz','http://sourceforge.net'); |
| 1606 | - update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz',$tmp_dir.'awy.dat.gz','http://sourceforge.net'); |
|
| 1606 | + update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz', $tmp_dir.'awy.dat.gz', 'http://sourceforge.net'); |
|
| 1607 | 1607 | update_db::gunzip($tmp_dir.'awy.dat.gz'); |
| 1608 | 1608 | $error = update_db::waypoints($tmp_dir.'awy.dat'); |
| 1609 | 1609 | return $error; |
@@ -1623,7 +1623,7 @@ discard block |
||
| 1623 | 1623 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 1624 | 1624 | if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
| 1625 | 1625 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 1626 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1626 | + if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1627 | 1627 | } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
| 1628 | 1628 | } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
| 1629 | 1629 | if ($error != '') { |
@@ -1636,7 +1636,7 @@ discard block |
||
| 1636 | 1636 | global $tmp_dir, $globalDebug; |
| 1637 | 1637 | $error = ''; |
| 1638 | 1638 | if ($globalDebug) echo "Routes : Download..."; |
| 1639 | - update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
|
| 1639 | + update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz'); |
|
| 1640 | 1640 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 1641 | 1641 | if ($globalDebug) echo "Gunzip..."; |
| 1642 | 1642 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
@@ -1652,7 +1652,7 @@ discard block |
||
| 1652 | 1652 | global $tmp_dir, $globalDebug; |
| 1653 | 1653 | $error = ''; |
| 1654 | 1654 | if ($globalDebug) echo "Schedules Oneworld : Download..."; |
| 1655 | - update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
|
| 1655 | + update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz'); |
|
| 1656 | 1656 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 1657 | 1657 | if ($globalDebug) echo "Gunzip..."; |
| 1658 | 1658 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
@@ -1668,7 +1668,7 @@ discard block |
||
| 1668 | 1668 | global $tmp_dir, $globalDebug; |
| 1669 | 1669 | $error = ''; |
| 1670 | 1670 | if ($globalDebug) echo "Schedules Skyteam : Download..."; |
| 1671 | - update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
|
| 1671 | + update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz'); |
|
| 1672 | 1672 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 1673 | 1673 | if ($globalDebug) echo "Gunzip..."; |
| 1674 | 1674 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
@@ -1696,7 +1696,7 @@ discard block |
||
| 1696 | 1696 | */ |
| 1697 | 1697 | if ($globalDebug) echo "Modes : Download..."; |
| 1698 | 1698 | // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
| 1699 | - update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
|
| 1699 | + update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz'); |
|
| 1700 | 1700 | |
| 1701 | 1701 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 1702 | 1702 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
@@ -1716,7 +1716,7 @@ discard block |
||
| 1716 | 1716 | public static function update_ModeS_faa() { |
| 1717 | 1717 | global $tmp_dir, $globalDebug; |
| 1718 | 1718 | if ($globalDebug) echo "Modes FAA: Download..."; |
| 1719 | - update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
|
| 1719 | + update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip'); |
|
| 1720 | 1720 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 1721 | 1721 | if ($globalDebug) echo "Unzip..."; |
| 1722 | 1722 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
@@ -1732,7 +1732,7 @@ discard block |
||
| 1732 | 1732 | public static function update_ModeS_flarm() { |
| 1733 | 1733 | global $tmp_dir, $globalDebug; |
| 1734 | 1734 | if ($globalDebug) echo "Modes Flarmnet: Download..."; |
| 1735 | - update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
|
| 1735 | + update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln'); |
|
| 1736 | 1736 | if (file_exists($tmp_dir.'data.fln')) { |
| 1737 | 1737 | if ($globalDebug) echo "Add to DB..."; |
| 1738 | 1738 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
@@ -1746,7 +1746,7 @@ discard block |
||
| 1746 | 1746 | public static function update_ModeS_ogn() { |
| 1747 | 1747 | global $tmp_dir, $globalDebug; |
| 1748 | 1748 | if ($globalDebug) echo "Modes OGN: Download..."; |
| 1749 | - update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
|
| 1749 | + update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv'); |
|
| 1750 | 1750 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 1751 | 1751 | if ($globalDebug) echo "Add to DB..."; |
| 1752 | 1752 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
@@ -1761,201 +1761,201 @@ discard block |
||
| 1761 | 1761 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 1762 | 1762 | |
| 1763 | 1763 | if ($globalDebug) echo "Owner France: Download..."; |
| 1764 | - update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
|
| 1764 | + update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv'); |
|
| 1765 | 1765 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 1766 | 1766 | if ($globalDebug) echo "Add to DB..."; |
| 1767 | - $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
|
| 1767 | + $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F'); |
|
| 1768 | 1768 | } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
| 1769 | 1769 | if ($error != '') { |
| 1770 | 1770 | return $error; |
| 1771 | 1771 | } elseif ($globalDebug) echo "Done\n"; |
| 1772 | 1772 | |
| 1773 | 1773 | if ($globalDebug) echo "Owner Ireland: Download..."; |
| 1774 | - update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
|
| 1774 | + update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv'); |
|
| 1775 | 1775 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 1776 | 1776 | if ($globalDebug) echo "Add to DB..."; |
| 1777 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
|
| 1777 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI'); |
|
| 1778 | 1778 | } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
| 1779 | 1779 | if ($error != '') { |
| 1780 | 1780 | return $error; |
| 1781 | 1781 | } elseif ($globalDebug) echo "Done\n"; |
| 1782 | 1782 | if ($globalDebug) echo "Owner Switzerland: Download..."; |
| 1783 | - update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
|
| 1783 | + update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv'); |
|
| 1784 | 1784 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 1785 | 1785 | if ($globalDebug) echo "Add to DB..."; |
| 1786 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
|
| 1786 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB'); |
|
| 1787 | 1787 | } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
| 1788 | 1788 | if ($error != '') { |
| 1789 | 1789 | return $error; |
| 1790 | 1790 | } elseif ($globalDebug) echo "Done\n"; |
| 1791 | 1791 | if ($globalDebug) echo "Owner Czech Republic: Download..."; |
| 1792 | - update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
|
| 1792 | + update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv'); |
|
| 1793 | 1793 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 1794 | 1794 | if ($globalDebug) echo "Add to DB..."; |
| 1795 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
|
| 1795 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK'); |
|
| 1796 | 1796 | } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
| 1797 | 1797 | if ($error != '') { |
| 1798 | 1798 | return $error; |
| 1799 | 1799 | } elseif ($globalDebug) echo "Done\n"; |
| 1800 | 1800 | if ($globalDebug) echo "Owner Australia: Download..."; |
| 1801 | - update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
|
| 1801 | + update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv'); |
|
| 1802 | 1802 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 1803 | 1803 | if ($globalDebug) echo "Add to DB..."; |
| 1804 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
|
| 1804 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH'); |
|
| 1805 | 1805 | } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
| 1806 | 1806 | if ($error != '') { |
| 1807 | 1807 | return $error; |
| 1808 | 1808 | } elseif ($globalDebug) echo "Done\n"; |
| 1809 | 1809 | if ($globalDebug) echo "Owner Austria: Download..."; |
| 1810 | - update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
|
| 1810 | + update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv'); |
|
| 1811 | 1811 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 1812 | 1812 | if ($globalDebug) echo "Add to DB..."; |
| 1813 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
|
| 1813 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE'); |
|
| 1814 | 1814 | } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
| 1815 | 1815 | if ($error != '') { |
| 1816 | 1816 | return $error; |
| 1817 | 1817 | } elseif ($globalDebug) echo "Done\n"; |
| 1818 | 1818 | if ($globalDebug) echo "Owner Chile: Download..."; |
| 1819 | - update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
|
| 1819 | + update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv'); |
|
| 1820 | 1820 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 1821 | 1821 | if ($globalDebug) echo "Add to DB..."; |
| 1822 | - $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
|
| 1822 | + $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC'); |
|
| 1823 | 1823 | } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
| 1824 | 1824 | if ($error != '') { |
| 1825 | 1825 | return $error; |
| 1826 | 1826 | } elseif ($globalDebug) echo "Done\n"; |
| 1827 | 1827 | if ($globalDebug) echo "Owner Colombia: Download..."; |
| 1828 | - update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
|
| 1828 | + update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv'); |
|
| 1829 | 1829 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 1830 | 1830 | if ($globalDebug) echo "Add to DB..."; |
| 1831 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
|
| 1831 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ'); |
|
| 1832 | 1832 | } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
| 1833 | 1833 | if ($error != '') { |
| 1834 | 1834 | return $error; |
| 1835 | 1835 | } elseif ($globalDebug) echo "Done\n"; |
| 1836 | 1836 | if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
| 1837 | - update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
|
| 1837 | + update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv'); |
|
| 1838 | 1838 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 1839 | 1839 | if ($globalDebug) echo "Add to DB..."; |
| 1840 | - $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
|
| 1840 | + $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7'); |
|
| 1841 | 1841 | } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
| 1842 | 1842 | if ($error != '') { |
| 1843 | 1843 | return $error; |
| 1844 | 1844 | } elseif ($globalDebug) echo "Done\n"; |
| 1845 | 1845 | if ($globalDebug) echo "Owner Brazil: Download..."; |
| 1846 | - update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
|
| 1846 | + update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv'); |
|
| 1847 | 1847 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 1848 | 1848 | if ($globalDebug) echo "Add to DB..."; |
| 1849 | - $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
|
| 1849 | + $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP'); |
|
| 1850 | 1850 | } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
| 1851 | 1851 | if ($error != '') { |
| 1852 | 1852 | return $error; |
| 1853 | 1853 | } elseif ($globalDebug) echo "Done\n"; |
| 1854 | 1854 | if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
| 1855 | - update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
|
| 1855 | + update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv'); |
|
| 1856 | 1856 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 1857 | 1857 | if ($globalDebug) echo "Add to DB..."; |
| 1858 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
|
| 1858 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP'); |
|
| 1859 | 1859 | } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
| 1860 | 1860 | if ($error != '') { |
| 1861 | 1861 | return $error; |
| 1862 | 1862 | } elseif ($globalDebug) echo "Done\n"; |
| 1863 | 1863 | if ($globalDebug) echo "Owner Croatia: Download..."; |
| 1864 | - update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
|
| 1864 | + update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv'); |
|
| 1865 | 1865 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 1866 | 1866 | if ($globalDebug) echo "Add to DB..."; |
| 1867 | - $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
|
| 1867 | + $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A'); |
|
| 1868 | 1868 | } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
| 1869 | 1869 | if ($error != '') { |
| 1870 | 1870 | return $error; |
| 1871 | 1871 | } elseif ($globalDebug) echo "Done\n"; |
| 1872 | 1872 | if ($globalDebug) echo "Owner Luxembourg: Download..."; |
| 1873 | - update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
|
| 1873 | + update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv'); |
|
| 1874 | 1874 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 1875 | 1875 | if ($globalDebug) echo "Add to DB..."; |
| 1876 | - $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
|
| 1876 | + $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX'); |
|
| 1877 | 1877 | } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
| 1878 | 1878 | if ($error != '') { |
| 1879 | 1879 | return $error; |
| 1880 | 1880 | } elseif ($globalDebug) echo "Done\n"; |
| 1881 | 1881 | if ($globalDebug) echo "Owner Maldives: Download..."; |
| 1882 | - update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
|
| 1882 | + update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv'); |
|
| 1883 | 1883 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 1884 | 1884 | if ($globalDebug) echo "Add to DB..."; |
| 1885 | - $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
|
| 1885 | + $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q'); |
|
| 1886 | 1886 | } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
| 1887 | 1887 | if ($error != '') { |
| 1888 | 1888 | return $error; |
| 1889 | 1889 | } elseif ($globalDebug) echo "Done\n"; |
| 1890 | 1890 | if ($globalDebug) echo "Owner New Zealand: Download..."; |
| 1891 | - update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
|
| 1891 | + update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv'); |
|
| 1892 | 1892 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 1893 | 1893 | if ($globalDebug) echo "Add to DB..."; |
| 1894 | - $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
|
| 1894 | + $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK'); |
|
| 1895 | 1895 | } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
| 1896 | 1896 | if ($error != '') { |
| 1897 | 1897 | return $error; |
| 1898 | 1898 | } elseif ($globalDebug) echo "Done\n"; |
| 1899 | 1899 | if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
| 1900 | - update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
|
| 1900 | + update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv'); |
|
| 1901 | 1901 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 1902 | 1902 | if ($globalDebug) echo "Add to DB..."; |
| 1903 | - $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
|
| 1903 | + $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2'); |
|
| 1904 | 1904 | } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
| 1905 | 1905 | if ($error != '') { |
| 1906 | 1906 | return $error; |
| 1907 | 1907 | } elseif ($globalDebug) echo "Done\n"; |
| 1908 | 1908 | if ($globalDebug) echo "Owner Slovakia: Download..."; |
| 1909 | - update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
|
| 1909 | + update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv'); |
|
| 1910 | 1910 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 1911 | 1911 | if ($globalDebug) echo "Add to DB..."; |
| 1912 | - $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
|
| 1912 | + $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM'); |
|
| 1913 | 1913 | } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
| 1914 | 1914 | if ($error != '') { |
| 1915 | 1915 | return $error; |
| 1916 | 1916 | } elseif ($globalDebug) echo "Done\n"; |
| 1917 | 1917 | if ($globalDebug) echo "Owner Ecuador: Download..."; |
| 1918 | - update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
|
| 1918 | + update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv'); |
|
| 1919 | 1919 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 1920 | 1920 | if ($globalDebug) echo "Add to DB..."; |
| 1921 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
|
| 1921 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC'); |
|
| 1922 | 1922 | } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
| 1923 | 1923 | if ($error != '') { |
| 1924 | 1924 | return $error; |
| 1925 | 1925 | } elseif ($globalDebug) echo "Done\n"; |
| 1926 | 1926 | if ($globalDebug) echo "Owner Iceland: Download..."; |
| 1927 | - update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
|
| 1927 | + update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv'); |
|
| 1928 | 1928 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 1929 | 1929 | if ($globalDebug) echo "Add to DB..."; |
| 1930 | - $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
|
| 1930 | + $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF'); |
|
| 1931 | 1931 | } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
| 1932 | 1932 | if ($error != '') { |
| 1933 | 1933 | return $error; |
| 1934 | 1934 | } elseif ($globalDebug) echo "Done\n"; |
| 1935 | 1935 | if ($globalDebug) echo "Owner Isle of Man: Download..."; |
| 1936 | - update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
|
| 1936 | + update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv'); |
|
| 1937 | 1937 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 1938 | 1938 | if ($globalDebug) echo "Add to DB..."; |
| 1939 | - $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
|
| 1939 | + $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M'); |
|
| 1940 | 1940 | } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
| 1941 | 1941 | if ($error != '') { |
| 1942 | 1942 | return $error; |
| 1943 | 1943 | } elseif ($globalDebug) echo "Done\n"; |
| 1944 | 1944 | if ($globalMasterSource) { |
| 1945 | 1945 | if ($globalDebug) echo "ModeS Netherlands: Download..."; |
| 1946 | - update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
|
| 1946 | + update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv'); |
|
| 1947 | 1947 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 1948 | 1948 | if ($globalDebug) echo "Add to DB..."; |
| 1949 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
|
| 1949 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH'); |
|
| 1950 | 1950 | } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
| 1951 | 1951 | if ($error != '') { |
| 1952 | 1952 | return $error; |
| 1953 | 1953 | } elseif ($globalDebug) echo "Done\n"; |
| 1954 | 1954 | if ($globalDebug) echo "ModeS Denmark: Download..."; |
| 1955 | - update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
|
| 1955 | + update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv'); |
|
| 1956 | 1956 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 1957 | 1957 | if ($globalDebug) echo "Add to DB..."; |
| 1958 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
|
| 1958 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY'); |
|
| 1959 | 1959 | } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
| 1960 | 1960 | if ($error != '') { |
| 1961 | 1961 | return $error; |
@@ -1968,7 +1968,7 @@ discard block |
||
| 1968 | 1968 | global $tmp_dir, $globalDebug; |
| 1969 | 1969 | $error = ''; |
| 1970 | 1970 | if ($globalDebug) echo "Translation : Download..."; |
| 1971 | - update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
|
| 1971 | + update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip'); |
|
| 1972 | 1972 | if (file_exists($tmp_dir.'translation.zip')) { |
| 1973 | 1973 | if ($globalDebug) echo "Unzip..."; |
| 1974 | 1974 | update_db::unzip($tmp_dir.'translation.zip'); |
@@ -1984,7 +1984,7 @@ discard block |
||
| 1984 | 1984 | public static function update_translation_fam() { |
| 1985 | 1985 | global $tmp_dir, $globalDebug; |
| 1986 | 1986 | if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
| 1987 | - update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
|
| 1987 | + update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz'); |
|
| 1988 | 1988 | if (file_exists($tmp_dir.'translation.tsv.gz')) { |
| 1989 | 1989 | if ($globalDebug) echo "Gunzip..."; |
| 1990 | 1990 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
@@ -1999,7 +1999,7 @@ discard block |
||
| 1999 | 1999 | public static function update_ModeS_fam() { |
| 2000 | 2000 | global $tmp_dir, $globalDebug; |
| 2001 | 2001 | if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
| 2002 | - update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
|
| 2002 | + update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz'); |
|
| 2003 | 2003 | if (file_exists($tmp_dir.'modes.tsv.gz')) { |
| 2004 | 2004 | if ($globalDebug) echo "Gunzip..."; |
| 2005 | 2005 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
@@ -2015,9 +2015,9 @@ discard block |
||
| 2015 | 2015 | global $tmp_dir, $globalDebug, $globalOwner; |
| 2016 | 2016 | if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
| 2017 | 2017 | if ($globalOwner === TRUE) { |
| 2018 | - update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2018 | + update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2019 | 2019 | } else { |
| 2020 | - update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2020 | + update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2021 | 2021 | } |
| 2022 | 2022 | if (file_exists($tmp_dir.'owners.tsv.gz')) { |
| 2023 | 2023 | if ($globalDebug) echo "Gunzip..."; |
@@ -2033,7 +2033,7 @@ discard block |
||
| 2033 | 2033 | public static function update_routes_fam() { |
| 2034 | 2034 | global $tmp_dir, $globalDebug; |
| 2035 | 2035 | if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
| 2036 | - update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
|
| 2036 | + update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz'); |
|
| 2037 | 2037 | if (file_exists($tmp_dir.'routes.tsv.gz')) { |
| 2038 | 2038 | if ($globalDebug) echo "Gunzip..."; |
| 2039 | 2039 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
@@ -2047,13 +2047,13 @@ discard block |
||
| 2047 | 2047 | } |
| 2048 | 2048 | public static function update_marine_identity_fam() { |
| 2049 | 2049 | global $tmp_dir, $globalDebug; |
| 2050 | - update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2050 | + update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2051 | 2051 | if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) { |
| 2052 | - $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2052 | + $marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2053 | 2053 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2054 | 2054 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2055 | 2055 | if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
| 2056 | - update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
|
| 2056 | + update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz'); |
|
| 2057 | 2057 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2058 | 2058 | if ($globalDebug) echo "Gunzip..."; |
| 2059 | 2059 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
@@ -2073,7 +2073,7 @@ discard block |
||
| 2073 | 2073 | public static function update_banned_fam() { |
| 2074 | 2074 | global $tmp_dir, $globalDebug; |
| 2075 | 2075 | if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
| 2076 | - update_db::download('http://data.flightairmap.fr/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
|
| 2076 | + update_db::download('http://data.flightairmap.fr/data/ban-eu.csv', $tmp_dir.'ban_eu.csv'); |
|
| 2077 | 2077 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2078 | 2078 | //if ($globalDebug) echo "Gunzip..."; |
| 2079 | 2079 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
@@ -2092,18 +2092,18 @@ discard block |
||
| 2092 | 2092 | $error = ''; |
| 2093 | 2093 | if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
| 2094 | 2094 | if ($globalDBdriver == 'mysql') { |
| 2095 | - update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2095 | + update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2096 | 2096 | } else { |
| 2097 | - update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2097 | + update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2098 | 2098 | } |
| 2099 | 2099 | if (file_exists($tmp_dir.'airspace.sql.gz.md5')) { |
| 2100 | - $airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2100 | + $airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2101 | 2101 | $airspace_md5 = $airspace_md5_file[0]; |
| 2102 | 2102 | if (!update_db::check_airspace_version($airspace_md5)) { |
| 2103 | 2103 | if ($globalDBdriver == 'mysql') { |
| 2104 | - update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2104 | + update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2105 | 2105 | } else { |
| 2106 | - update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2106 | + update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2107 | 2107 | } |
| 2108 | 2108 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2109 | 2109 | if ($globalDebug) echo "Gunzip..."; |
@@ -2115,7 +2115,7 @@ discard block |
||
| 2115 | 2115 | try { |
| 2116 | 2116 | $sth = $Connection->db->prepare($query); |
| 2117 | 2117 | $sth->execute(); |
| 2118 | - } catch(PDOException $e) { |
|
| 2118 | + } catch (PDOException $e) { |
|
| 2119 | 2119 | return "error : ".$e->getMessage(); |
| 2120 | 2120 | } |
| 2121 | 2121 | } |
@@ -2134,15 +2134,15 @@ discard block |
||
| 2134 | 2134 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
| 2135 | 2135 | $error = ''; |
| 2136 | 2136 | if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
| 2137 | - update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2137 | + update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5', $tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2138 | 2138 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
| 2139 | - $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2139 | + $geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2140 | 2140 | $geoid_md5 = $geoid_md5_file[0]; |
| 2141 | 2141 | if (!update_db::check_geoid_version($geoid_md5)) { |
| 2142 | - update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2142 | + update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz', $tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2143 | 2143 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
| 2144 | 2144 | if ($globalDebug) echo "Gunzip..."; |
| 2145 | - update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2145 | + update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz', dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2146 | 2146 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
| 2147 | 2147 | update_db::insert_geoid_version($geoid_md5); |
| 2148 | 2148 | } |
@@ -2158,15 +2158,15 @@ discard block |
||
| 2158 | 2158 | public static function update_tle() { |
| 2159 | 2159 | global $tmp_dir, $globalDebug; |
| 2160 | 2160 | if ($globalDebug) echo "Download TLE : Download..."; |
| 2161 | - $alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt', |
|
| 2162 | - 'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt', |
|
| 2163 | - 'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt'); |
|
| 2161 | + $alltle = array('stations.txt', 'gps-ops.txt', 'glo-ops.txt', 'galileo.txt', 'weather.txt', 'noaa.txt', 'goes.txt', 'resource.txt', 'dmc.txt', 'tdrss.txt', 'geo.txt', 'intelsat.txt', 'gorizont.txt', |
|
| 2162 | + 'raduga.txt', 'molniya.txt', 'iridium.txt', 'orbcomm.txt', 'globalstar.txt', 'amateur.txt', 'x-comm.txt', 'other-comm.txt', 'sbas.txt', 'nnss.txt', 'musson.txt', 'science.txt', 'geodetic.txt', |
|
| 2163 | + 'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt'); |
|
| 2164 | 2164 | foreach ($alltle as $filename) { |
| 2165 | 2165 | if ($globalDebug) echo "downloading ".$filename.'...'; |
| 2166 | - update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
|
| 2166 | + update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename); |
|
| 2167 | 2167 | if (file_exists($tmp_dir.$filename)) { |
| 2168 | 2168 | if ($globalDebug) echo "Add to DB ".$filename."..."; |
| 2169 | - $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
|
| 2169 | + $error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename)); |
|
| 2170 | 2170 | } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
| 2171 | 2171 | if ($error != '') { |
| 2172 | 2172 | echo $error."\n"; |
@@ -2179,32 +2179,32 @@ discard block |
||
| 2179 | 2179 | global $tmp_dir, $globalDebug; |
| 2180 | 2180 | $error = ''; |
| 2181 | 2181 | if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
| 2182 | - update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
|
| 2182 | + update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', $tmp_dir.'models.md5sum'); |
|
| 2183 | 2183 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2184 | 2184 | if ($globalDebug) echo "Check files...\n"; |
| 2185 | 2185 | $newmodelsdb = array(); |
| 2186 | - if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
|
| 2187 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2186 | + if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) { |
|
| 2187 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2188 | 2188 | $model = trim($row[2]); |
| 2189 | 2189 | $newmodelsdb[$model] = trim($row[0]); |
| 2190 | 2190 | } |
| 2191 | 2191 | } |
| 2192 | 2192 | $modelsdb = array(); |
| 2193 | 2193 | if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) { |
| 2194 | - if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) { |
|
| 2195 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2194 | + if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) { |
|
| 2195 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2196 | 2196 | $model = trim($row[2]); |
| 2197 | 2197 | $modelsdb[$model] = trim($row[0]); |
| 2198 | 2198 | } |
| 2199 | 2199 | } |
| 2200 | 2200 | } |
| 2201 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2201 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2202 | 2202 | foreach ($diff as $key => $value) { |
| 2203 | 2203 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
| 2204 | - update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
|
| 2204 | + update_db::download('http://data.flightairmap.fr/data/models/'.$key, dirname(__FILE__).'/../models/'.$key); |
|
| 2205 | 2205 | |
| 2206 | 2206 | } |
| 2207 | - update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2207 | + update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2208 | 2208 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2209 | 2209 | if ($error != '') { |
| 2210 | 2210 | return $error; |
@@ -2216,32 +2216,32 @@ discard block |
||
| 2216 | 2216 | global $tmp_dir, $globalDebug; |
| 2217 | 2217 | $error = ''; |
| 2218 | 2218 | if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
| 2219 | - update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
|
| 2219 | + update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum'); |
|
| 2220 | 2220 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2221 | 2221 | if ($globalDebug) echo "Check files...\n"; |
| 2222 | 2222 | $newmodelsdb = array(); |
| 2223 | - if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
|
| 2224 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2223 | + if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) { |
|
| 2224 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2225 | 2225 | $model = trim($row[2]); |
| 2226 | 2226 | $newmodelsdb[$model] = trim($row[0]); |
| 2227 | 2227 | } |
| 2228 | 2228 | } |
| 2229 | 2229 | $modelsdb = array(); |
| 2230 | 2230 | if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) { |
| 2231 | - if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) { |
|
| 2232 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2231 | + if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) { |
|
| 2232 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2233 | 2233 | $model = trim($row[2]); |
| 2234 | 2234 | $modelsdb[$model] = trim($row[0]); |
| 2235 | 2235 | } |
| 2236 | 2236 | } |
| 2237 | 2237 | } |
| 2238 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2238 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2239 | 2239 | foreach ($diff as $key => $value) { |
| 2240 | 2240 | if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
| 2241 | - update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
|
| 2241 | + update_db::download('http://data.flightairmap.fr/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key); |
|
| 2242 | 2242 | |
| 2243 | 2243 | } |
| 2244 | - update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2244 | + update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2245 | 2245 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2246 | 2246 | if ($error != '') { |
| 2247 | 2247 | return $error; |
@@ -2253,32 +2253,32 @@ discard block |
||
| 2253 | 2253 | global $tmp_dir, $globalDebug; |
| 2254 | 2254 | $error = ''; |
| 2255 | 2255 | if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
| 2256 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
|
| 2256 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum'); |
|
| 2257 | 2257 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2258 | 2258 | if ($globalDebug) echo "Check files...\n"; |
| 2259 | 2259 | $newmodelsdb = array(); |
| 2260 | - if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2261 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2260 | + if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2261 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2262 | 2262 | $model = trim($row[2]); |
| 2263 | 2263 | $newmodelsdb[$model] = trim($row[0]); |
| 2264 | 2264 | } |
| 2265 | 2265 | } |
| 2266 | 2266 | $modelsdb = array(); |
| 2267 | 2267 | if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) { |
| 2268 | - if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2269 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2268 | + if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2269 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2270 | 2270 | $model = trim($row[2]); |
| 2271 | 2271 | $modelsdb[$model] = trim($row[0]); |
| 2272 | 2272 | } |
| 2273 | 2273 | } |
| 2274 | 2274 | } |
| 2275 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2275 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2276 | 2276 | foreach ($diff as $key => $value) { |
| 2277 | 2277 | if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
| 2278 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2278 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2279 | 2279 | |
| 2280 | 2280 | } |
| 2281 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2281 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2282 | 2282 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2283 | 2283 | if ($error != '') { |
| 2284 | 2284 | return $error; |
@@ -2301,8 +2301,8 @@ discard block |
||
| 2301 | 2301 | */ |
| 2302 | 2302 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2303 | 2303 | //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
| 2304 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2305 | - $result = fread($fh,100000000); |
|
| 2304 | + $fh = fopen($tmp_dir.'aircrafts.html', "r"); |
|
| 2305 | + $result = fread($fh, 100000000); |
|
| 2306 | 2306 | //echo $result; |
| 2307 | 2307 | //var_dump(str_get_html($result)); |
| 2308 | 2308 | //print_r(self::table2array($result)); |
@@ -2320,23 +2320,23 @@ discard block |
||
| 2320 | 2320 | $Connection = new Connection(); |
| 2321 | 2321 | $sth = $Connection->db->prepare($query); |
| 2322 | 2322 | $sth->execute(); |
| 2323 | - } catch(PDOException $e) { |
|
| 2323 | + } catch (PDOException $e) { |
|
| 2324 | 2324 | return "error : ".$e->getMessage(); |
| 2325 | 2325 | } |
| 2326 | 2326 | |
| 2327 | 2327 | $error = ''; |
| 2328 | 2328 | if ($globalDebug) echo "Notam : Download..."; |
| 2329 | - update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
|
| 2329 | + update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss'); |
|
| 2330 | 2330 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2331 | - $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
|
| 2331 | + $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true); |
|
| 2332 | 2332 | foreach ($notams['channel']['item'] as $notam) { |
| 2333 | - $title = explode(':',$notam['title']); |
|
| 2333 | + $title = explode(':', $notam['title']); |
|
| 2334 | 2334 | $data['ref'] = trim($title[0]); |
| 2335 | 2335 | unset($title[0]); |
| 2336 | - $data['title'] = trim(implode(':',$title)); |
|
| 2337 | - $description = strip_tags($notam['description'],'<pre>'); |
|
| 2338 | - preg_match(':^(.*?)<pre>:',$description,$match); |
|
| 2339 | - $q = explode('/',$match[1]); |
|
| 2336 | + $data['title'] = trim(implode(':', $title)); |
|
| 2337 | + $description = strip_tags($notam['description'], '<pre>'); |
|
| 2338 | + preg_match(':^(.*?)<pre>:', $description, $match); |
|
| 2339 | + $q = explode('/', $match[1]); |
|
| 2340 | 2340 | $data['fir'] = $q[0]; |
| 2341 | 2341 | $data['code'] = $q[1]; |
| 2342 | 2342 | $ifrvfr = $q[2]; |
@@ -2352,30 +2352,30 @@ discard block |
||
| 2352 | 2352 | $data['lower_limit'] = $q[5]; |
| 2353 | 2353 | $data['upper_limit'] = $q[6]; |
| 2354 | 2354 | $latlonrad = $q[7]; |
| 2355 | - sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
|
| 2356 | - $latitude = $Common->convertDec($las,'latitude'); |
|
| 2357 | - $longitude = $Common->convertDec($lns,'longitude'); |
|
| 2355 | + sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius); |
|
| 2356 | + $latitude = $Common->convertDec($las, 'latitude'); |
|
| 2357 | + $longitude = $Common->convertDec($lns, 'longitude'); |
|
| 2358 | 2358 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 2359 | 2359 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 2360 | 2360 | $data['center_latitude'] = $latitude; |
| 2361 | 2361 | $data['center_longitude'] = $longitude; |
| 2362 | 2362 | $data['radius'] = intval($radius); |
| 2363 | 2363 | |
| 2364 | - preg_match(':<pre>(.*?)</pre>:',$description,$match); |
|
| 2364 | + preg_match(':<pre>(.*?)</pre>:', $description, $match); |
|
| 2365 | 2365 | $data['text'] = $match[1]; |
| 2366 | - preg_match(':</pre>(.*?)$:',$description,$match); |
|
| 2366 | + preg_match(':</pre>(.*?)$:', $description, $match); |
|
| 2367 | 2367 | $fromto = $match[1]; |
| 2368 | - preg_match('#FROM:(.*?)TO:#',$fromto,$match); |
|
| 2368 | + preg_match('#FROM:(.*?)TO:#', $fromto, $match); |
|
| 2369 | 2369 | $fromall = trim($match[1]); |
| 2370 | - preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match); |
|
| 2370 | + preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match); |
|
| 2371 | 2371 | $from = trim($match[1]); |
| 2372 | - $data['date_begin'] = date("Y-m-d H:i:s",strtotime($from)); |
|
| 2373 | - preg_match('#TO:(.*?)$#',$fromto,$match); |
|
| 2372 | + $data['date_begin'] = date("Y-m-d H:i:s", strtotime($from)); |
|
| 2373 | + preg_match('#TO:(.*?)$#', $fromto, $match); |
|
| 2374 | 2374 | $toall = trim($match[1]); |
| 2375 | - if (!preg_match(':Permanent:',$toall)) { |
|
| 2376 | - preg_match('#^(.*?) \((.*?)\)#',$toall,$match); |
|
| 2375 | + if (!preg_match(':Permanent:', $toall)) { |
|
| 2376 | + preg_match('#^(.*?) \((.*?)\)#', $toall, $match); |
|
| 2377 | 2377 | $to = trim($match[1]); |
| 2378 | - $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
|
| 2378 | + $data['date_end'] = date("Y-m-d H:i:s", strtotime($to)); |
|
| 2379 | 2379 | $data['permanent'] = 0; |
| 2380 | 2380 | } else { |
| 2381 | 2381 | $data['date_end'] = NULL; |
@@ -2383,7 +2383,7 @@ discard block |
||
| 2383 | 2383 | } |
| 2384 | 2384 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2385 | 2385 | $NOTAM = new NOTAM(); |
| 2386 | - $NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 2386 | + $NOTAM->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['center_latitude'], $data['center_longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']); |
|
| 2387 | 2387 | unset($data); |
| 2388 | 2388 | } |
| 2389 | 2389 | } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
@@ -2406,16 +2406,16 @@ discard block |
||
| 2406 | 2406 | $Connection = new Connection(); |
| 2407 | 2407 | $sth = $Connection->db->prepare($query); |
| 2408 | 2408 | $sth->execute(); |
| 2409 | - } catch(PDOException $e) { |
|
| 2409 | + } catch (PDOException $e) { |
|
| 2410 | 2410 | return "error : ".$e->getMessage(); |
| 2411 | 2411 | } |
| 2412 | 2412 | } |
| 2413 | 2413 | $Common = new Common(); |
| 2414 | 2414 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 2415 | - $airspace_json = json_decode($airspace_lst,true); |
|
| 2415 | + $airspace_json = json_decode($airspace_lst, true); |
|
| 2416 | 2416 | foreach ($airspace_json['records'] as $airspace) { |
| 2417 | 2417 | if ($globalDebug) echo $airspace['name']."...\n"; |
| 2418 | - update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
|
| 2418 | + update_db::download($airspace['uri'], $tmp_dir.$airspace['name']); |
|
| 2419 | 2419 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 2420 | 2420 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
| 2421 | 2421 | //system('recode l9..utf8 '.$tmp_dir.$airspace['name']); |
@@ -2437,7 +2437,7 @@ discard block |
||
| 2437 | 2437 | $Connection = new Connection(); |
| 2438 | 2438 | $sth = $Connection->db->prepare($query); |
| 2439 | 2439 | $sth->execute(array(':new' => $new, ':old' => $old)); |
| 2440 | - } catch(PDOException $e) { |
|
| 2440 | + } catch (PDOException $e) { |
|
| 2441 | 2441 | return "error : ".$e->getMessage(); |
| 2442 | 2442 | } |
| 2443 | 2443 | } |
@@ -2454,7 +2454,7 @@ discard block |
||
| 2454 | 2454 | $Connection = new Connection(); |
| 2455 | 2455 | $sth = $Connection->db->prepare($query); |
| 2456 | 2456 | $sth->execute(); |
| 2457 | - } catch(PDOException $e) { |
|
| 2457 | + } catch (PDOException $e) { |
|
| 2458 | 2458 | return "error : ".$e->getMessage(); |
| 2459 | 2459 | } |
| 2460 | 2460 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2469,7 +2469,7 @@ discard block |
||
| 2469 | 2469 | $Connection = new Connection(); |
| 2470 | 2470 | $sth = $Connection->db->prepare($query); |
| 2471 | 2471 | $sth->execute(); |
| 2472 | - } catch(PDOException $e) { |
|
| 2472 | + } catch (PDOException $e) { |
|
| 2473 | 2473 | return "error : ".$e->getMessage(); |
| 2474 | 2474 | } |
| 2475 | 2475 | } |
@@ -2480,7 +2480,7 @@ discard block |
||
| 2480 | 2480 | $Connection = new Connection(); |
| 2481 | 2481 | $sth = $Connection->db->prepare($query); |
| 2482 | 2482 | $sth->execute(array(':version' => $version)); |
| 2483 | - } catch(PDOException $e) { |
|
| 2483 | + } catch (PDOException $e) { |
|
| 2484 | 2484 | return "error : ".$e->getMessage(); |
| 2485 | 2485 | } |
| 2486 | 2486 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2494,7 +2494,7 @@ discard block |
||
| 2494 | 2494 | $Connection = new Connection(); |
| 2495 | 2495 | $sth = $Connection->db->prepare($query); |
| 2496 | 2496 | $sth->execute(array(':version' => $version)); |
| 2497 | - } catch(PDOException $e) { |
|
| 2497 | + } catch (PDOException $e) { |
|
| 2498 | 2498 | return "error : ".$e->getMessage(); |
| 2499 | 2499 | } |
| 2500 | 2500 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2508,7 +2508,7 @@ discard block |
||
| 2508 | 2508 | $Connection = new Connection(); |
| 2509 | 2509 | $sth = $Connection->db->prepare($query); |
| 2510 | 2510 | $sth->execute(array(':version' => $version)); |
| 2511 | - } catch(PDOException $e) { |
|
| 2511 | + } catch (PDOException $e) { |
|
| 2512 | 2512 | return "error : ".$e->getMessage(); |
| 2513 | 2513 | } |
| 2514 | 2514 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2524,7 +2524,7 @@ discard block |
||
| 2524 | 2524 | $Connection = new Connection(); |
| 2525 | 2525 | $sth = $Connection->db->prepare($query); |
| 2526 | 2526 | $sth->execute(array(':version' => $version)); |
| 2527 | - } catch(PDOException $e) { |
|
| 2527 | + } catch (PDOException $e) { |
|
| 2528 | 2528 | return "error : ".$e->getMessage(); |
| 2529 | 2529 | } |
| 2530 | 2530 | } |
@@ -2536,7 +2536,7 @@ discard block |
||
| 2536 | 2536 | $Connection = new Connection(); |
| 2537 | 2537 | $sth = $Connection->db->prepare($query); |
| 2538 | 2538 | $sth->execute(array(':version' => $version)); |
| 2539 | - } catch(PDOException $e) { |
|
| 2539 | + } catch (PDOException $e) { |
|
| 2540 | 2540 | return "error : ".$e->getMessage(); |
| 2541 | 2541 | } |
| 2542 | 2542 | } |
@@ -2548,7 +2548,7 @@ discard block |
||
| 2548 | 2548 | $Connection = new Connection(); |
| 2549 | 2549 | $sth = $Connection->db->prepare($query); |
| 2550 | 2550 | $sth->execute(array(':version' => $version)); |
| 2551 | - } catch(PDOException $e) { |
|
| 2551 | + } catch (PDOException $e) { |
|
| 2552 | 2552 | return "error : ".$e->getMessage(); |
| 2553 | 2553 | } |
| 2554 | 2554 | } |
@@ -2564,7 +2564,7 @@ discard block |
||
| 2564 | 2564 | $Connection = new Connection(); |
| 2565 | 2565 | $sth = $Connection->db->prepare($query); |
| 2566 | 2566 | $sth->execute(); |
| 2567 | - } catch(PDOException $e) { |
|
| 2567 | + } catch (PDOException $e) { |
|
| 2568 | 2568 | return "error : ".$e->getMessage(); |
| 2569 | 2569 | } |
| 2570 | 2570 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2579,7 +2579,7 @@ discard block |
||
| 2579 | 2579 | $Connection = new Connection(); |
| 2580 | 2580 | $sth = $Connection->db->prepare($query); |
| 2581 | 2581 | $sth->execute(); |
| 2582 | - } catch(PDOException $e) { |
|
| 2582 | + } catch (PDOException $e) { |
|
| 2583 | 2583 | return "error : ".$e->getMessage(); |
| 2584 | 2584 | } |
| 2585 | 2585 | } |
@@ -2595,7 +2595,7 @@ discard block |
||
| 2595 | 2595 | $Connection = new Connection(); |
| 2596 | 2596 | $sth = $Connection->db->prepare($query); |
| 2597 | 2597 | $sth->execute(); |
| 2598 | - } catch(PDOException $e) { |
|
| 2598 | + } catch (PDOException $e) { |
|
| 2599 | 2599 | return "error : ".$e->getMessage(); |
| 2600 | 2600 | } |
| 2601 | 2601 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2610,7 +2610,7 @@ discard block |
||
| 2610 | 2610 | $Connection = new Connection(); |
| 2611 | 2611 | $sth = $Connection->db->prepare($query); |
| 2612 | 2612 | $sth->execute(); |
| 2613 | - } catch(PDOException $e) { |
|
| 2613 | + } catch (PDOException $e) { |
|
| 2614 | 2614 | return "error : ".$e->getMessage(); |
| 2615 | 2615 | } |
| 2616 | 2616 | } |
@@ -2626,7 +2626,7 @@ discard block |
||
| 2626 | 2626 | $Connection = new Connection(); |
| 2627 | 2627 | $sth = $Connection->db->prepare($query); |
| 2628 | 2628 | $sth->execute(); |
| 2629 | - } catch(PDOException $e) { |
|
| 2629 | + } catch (PDOException $e) { |
|
| 2630 | 2630 | return "error : ".$e->getMessage(); |
| 2631 | 2631 | } |
| 2632 | 2632 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2641,7 +2641,7 @@ discard block |
||
| 2641 | 2641 | $Connection = new Connection(); |
| 2642 | 2642 | $sth = $Connection->db->prepare($query); |
| 2643 | 2643 | $sth->execute(); |
| 2644 | - } catch(PDOException $e) { |
|
| 2644 | + } catch (PDOException $e) { |
|
| 2645 | 2645 | return "error : ".$e->getMessage(); |
| 2646 | 2646 | } |
| 2647 | 2647 | } |
@@ -2657,7 +2657,7 @@ discard block |
||
| 2657 | 2657 | $Connection = new Connection(); |
| 2658 | 2658 | $sth = $Connection->db->prepare($query); |
| 2659 | 2659 | $sth->execute(); |
| 2660 | - } catch(PDOException $e) { |
|
| 2660 | + } catch (PDOException $e) { |
|
| 2661 | 2661 | return "error : ".$e->getMessage(); |
| 2662 | 2662 | } |
| 2663 | 2663 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2672,7 +2672,7 @@ discard block |
||
| 2672 | 2672 | $Connection = new Connection(); |
| 2673 | 2673 | $sth = $Connection->db->prepare($query); |
| 2674 | 2674 | $sth->execute(); |
| 2675 | - } catch(PDOException $e) { |
|
| 2675 | + } catch (PDOException $e) { |
|
| 2676 | 2676 | return "error : ".$e->getMessage(); |
| 2677 | 2677 | } |
| 2678 | 2678 | } |
@@ -2687,7 +2687,7 @@ discard block |
||
| 2687 | 2687 | $Connection = new Connection(); |
| 2688 | 2688 | $sth = $Connection->db->prepare($query); |
| 2689 | 2689 | $sth->execute(); |
| 2690 | - } catch(PDOException $e) { |
|
| 2690 | + } catch (PDOException $e) { |
|
| 2691 | 2691 | return "error : ".$e->getMessage(); |
| 2692 | 2692 | } |
| 2693 | 2693 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2702,7 +2702,7 @@ discard block |
||
| 2702 | 2702 | $Connection = new Connection(); |
| 2703 | 2703 | $sth = $Connection->db->prepare($query); |
| 2704 | 2704 | $sth->execute(); |
| 2705 | - } catch(PDOException $e) { |
|
| 2705 | + } catch (PDOException $e) { |
|
| 2706 | 2706 | return "error : ".$e->getMessage(); |
| 2707 | 2707 | } |
| 2708 | 2708 | } |
@@ -2717,7 +2717,7 @@ discard block |
||
| 2717 | 2717 | $Connection = new Connection(); |
| 2718 | 2718 | $sth = $Connection->db->prepare($query); |
| 2719 | 2719 | $sth->execute(); |
| 2720 | - } catch(PDOException $e) { |
|
| 2720 | + } catch (PDOException $e) { |
|
| 2721 | 2721 | return "error : ".$e->getMessage(); |
| 2722 | 2722 | } |
| 2723 | 2723 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2732,7 +2732,7 @@ discard block |
||
| 2732 | 2732 | $Connection = new Connection(); |
| 2733 | 2733 | $sth = $Connection->db->prepare($query); |
| 2734 | 2734 | $sth->execute(); |
| 2735 | - } catch(PDOException $e) { |
|
| 2735 | + } catch (PDOException $e) { |
|
| 2736 | 2736 | return "error : ".$e->getMessage(); |
| 2737 | 2737 | } |
| 2738 | 2738 | } |
@@ -2747,7 +2747,7 @@ discard block |
||
| 2747 | 2747 | $Connection = new Connection(); |
| 2748 | 2748 | $sth = $Connection->db->prepare($query); |
| 2749 | 2749 | $sth->execute(); |
| 2750 | - } catch(PDOException $e) { |
|
| 2750 | + } catch (PDOException $e) { |
|
| 2751 | 2751 | return "error : ".$e->getMessage(); |
| 2752 | 2752 | } |
| 2753 | 2753 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2762,7 +2762,7 @@ discard block |
||
| 2762 | 2762 | $Connection = new Connection(); |
| 2763 | 2763 | $sth = $Connection->db->prepare($query); |
| 2764 | 2764 | $sth->execute(); |
| 2765 | - } catch(PDOException $e) { |
|
| 2765 | + } catch (PDOException $e) { |
|
| 2766 | 2766 | return "error : ".$e->getMessage(); |
| 2767 | 2767 | } |
| 2768 | 2768 | } |
@@ -2777,7 +2777,7 @@ discard block |
||
| 2777 | 2777 | $Connection = new Connection(); |
| 2778 | 2778 | $sth = $Connection->db->prepare($query); |
| 2779 | 2779 | $sth->execute(); |
| 2780 | - } catch(PDOException $e) { |
|
| 2780 | + } catch (PDOException $e) { |
|
| 2781 | 2781 | return "error : ".$e->getMessage(); |
| 2782 | 2782 | } |
| 2783 | 2783 | } |
@@ -2792,7 +2792,7 @@ discard block |
||
| 2792 | 2792 | $Connection = new Connection(); |
| 2793 | 2793 | $sth = $Connection->db->prepare($query); |
| 2794 | 2794 | $sth->execute(); |
| 2795 | - } catch(PDOException $e) { |
|
| 2795 | + } catch (PDOException $e) { |
|
| 2796 | 2796 | return "error : ".$e->getMessage(); |
| 2797 | 2797 | } |
| 2798 | 2798 | } |
@@ -22,14 +22,14 @@ discard block |
||
| 22 | 22 | * @return String the icao |
| 23 | 23 | */ |
| 24 | 24 | public function ident2icao($ident) { |
| 25 | - if (substr($ident,0,2) == 'AF') { |
|
| 26 | - if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 27 | - else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 25 | + if (substr($ident, 0, 2) == 'AF') { |
|
| 26 | + if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 27 | + else $icao = 'AFR'.ltrim(substr($ident, 2), '0'); |
|
| 28 | 28 | } else { |
| 29 | 29 | $Spotter = new Spotter($this->db); |
| 30 | - $identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2)); |
|
| 30 | + $identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2)); |
|
| 31 | 31 | if (isset($identicao[0])) { |
| 32 | - $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
|
| 32 | + $icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0'); |
|
| 33 | 33 | } else $icao = $ident; |
| 34 | 34 | } |
| 35 | 35 | return $icao; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | $sth = $this->db->prepare($query); |
| 55 | 55 | $sth->execute(); |
| 56 | - } catch(PDOException $e) { |
|
| 56 | + } catch (PDOException $e) { |
|
| 57 | 57 | return "error"; |
| 58 | 58 | } |
| 59 | 59 | return "success"; |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | $sth = $this->db->prepare($query); |
| 79 | 79 | $sth->execute(); |
| 80 | - } catch(PDOException $e) { |
|
| 80 | + } catch (PDOException $e) { |
|
| 81 | 81 | return "error"; |
| 82 | 82 | } |
| 83 | 83 | return "success"; |
@@ -102,13 +102,13 @@ discard block |
||
| 102 | 102 | $ident = ''; |
| 103 | 103 | $message = ''; |
| 104 | 104 | $result = array(); |
| 105 | - $n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 106 | - if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 107 | - if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 108 | - if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 105 | + $n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message); |
|
| 106 | + if ($n == 0) $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message); |
|
| 107 | + if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message); |
|
| 108 | + if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message); |
|
| 109 | 109 | if ($n != 0) { |
| 110 | - $registration = str_replace('.','',$registration); |
|
| 111 | - $result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message); |
|
| 110 | + $registration = str_replace('.', '', $registration); |
|
| 111 | + $result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message); |
|
| 112 | 112 | if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n"; |
| 113 | 113 | } else $message = $data; |
| 114 | 114 | $decode = array(); |
@@ -128,14 +128,14 @@ discard block |
||
| 128 | 128 | $temp = ''; |
| 129 | 129 | $n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp); |
| 130 | 130 | if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) { |
| 131 | - $latitude = $la / 10000.0; |
|
| 132 | - $longitude = $ln / 10000.0; |
|
| 131 | + $latitude = $la/10000.0; |
|
| 132 | + $longitude = $ln/10000.0; |
|
| 133 | 133 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 134 | 134 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 135 | 135 | // Temp not always available |
| 136 | 136 | if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n"; |
| 137 | - if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt); |
|
| 138 | - else $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C'); |
|
| 137 | + if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt); |
|
| 138 | + else $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C'); |
|
| 139 | 139 | |
| 140 | 140 | //$icao = $Translation->checkTranslation($ident); |
| 141 | 141 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
@@ -147,19 +147,19 @@ discard block |
||
| 147 | 147 | $dhour = ''; |
| 148 | 148 | $darr = ''; |
| 149 | 149 | $ahour = ''; |
| 150 | - $n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour); |
|
| 150 | + $n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour); |
|
| 151 | 151 | if ($n == 4 && strlen($darr) == 4) { |
| 152 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 153 | - if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2); |
|
| 154 | - if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n"; |
|
| 152 | + if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2); |
|
| 153 | + if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2); |
|
| 154 | + if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n"; |
|
| 155 | 155 | //$icao = ACARS->ident2icao($ident); |
| 156 | 156 | //$icao = $Translation->checkTranslation($ident); |
| 157 | 157 | //$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS'); |
| 158 | 158 | $decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour); |
| 159 | 159 | $found = true; |
| 160 | 160 | } |
| 161 | - elseif ($n == 2 || $n == 4) { |
|
| 162 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 161 | + elseif ($n == 2 || $n == 4) { |
|
| 162 | + if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2); |
|
| 163 | 163 | if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n"; |
| 164 | 164 | //$icao = ACARS->ident2icao($ident); |
| 165 | 165 | //$icao = $Translation->checkTranslation($ident); |
@@ -217,11 +217,11 @@ discard block |
||
| 217 | 217 | $ahour = ''; |
| 218 | 218 | $aair = ''; |
| 219 | 219 | $apiste = ''; |
| 220 | - $n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste); |
|
| 220 | + $n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste); |
|
| 221 | 221 | if ($n > 8) { |
| 222 | - if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n"; |
|
| 223 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 224 | - if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2); |
|
| 222 | + if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n"; |
|
| 223 | + if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2); |
|
| 224 | + if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2); |
|
| 225 | 225 | $icao = trim($aident); |
| 226 | 226 | |
| 227 | 227 | //$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste; |
@@ -246,8 +246,8 @@ discard block |
||
| 246 | 246 | if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) { |
| 247 | 247 | $las = $las.'.'.$lass; |
| 248 | 248 | $lns = $lns.'.'.$lns; |
| 249 | - $latitude = $las / 1000.0; |
|
| 250 | - $longitude = $lns / 1000.0; |
|
| 249 | + $latitude = $las/1000.0; |
|
| 250 | + $longitude = $lns/1000.0; |
|
| 251 | 251 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 252 | 252 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 253 | 253 | if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n"; |
@@ -342,17 +342,17 @@ discard block |
||
| 342 | 342 | $alt = ''; |
| 343 | 343 | $fuel = ''; |
| 344 | 344 | $speed = ''; |
| 345 | - $n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed); |
|
| 345 | + $n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed); |
|
| 346 | 346 | if ($n == 9) { |
| 347 | 347 | //if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
| 348 | 348 | $icao = trim($aident); |
| 349 | 349 | $decode['icao'] = $icao; |
| 350 | - $latitude = $las / 100.0; |
|
| 351 | - $longitude = $lns / 100.0; |
|
| 350 | + $latitude = $las/100.0; |
|
| 351 | + $longitude = $lns/100.0; |
|
| 352 | 352 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 353 | 353 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 354 | 354 | |
| 355 | - $decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed); |
|
| 355 | + $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed); |
|
| 356 | 356 | $found = true; |
| 357 | 357 | } |
| 358 | 358 | } |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 372 | 372 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 373 | 373 | |
| 374 | - $decode = array('Latitude' => $latitude,'Longitude' => $longitude); |
|
| 374 | + $decode = array('Latitude' => $latitude, 'Longitude' => $longitude); |
|
| 375 | 375 | $found = true; |
| 376 | 376 | } |
| 377 | 377 | } |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | $dair = ''; |
| 405 | 405 | $darr = ''; |
| 406 | 406 | $aident = ''; |
| 407 | - $n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident); |
|
| 407 | + $n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident); |
|
| 408 | 408 | if ($n == 8) { |
| 409 | 409 | if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
| 410 | 410 | $icao = trim($aident); |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | */ |
| 437 | 437 | $dair = ''; |
| 438 | 438 | $darr = ''; |
| 439 | - $n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr); |
|
| 439 | + $n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr); |
|
| 440 | 440 | if ($n == 3) { |
| 441 | 441 | if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
| 442 | 442 | //$icao = $Translation->checkTranslation($ident); |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | */ |
| 452 | 452 | $dair = ''; |
| 453 | 453 | $darr = ''; |
| 454 | - $n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr); |
|
| 454 | + $n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr); |
|
| 455 | 455 | if ($n == 3) { |
| 456 | 456 | if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
| 457 | 457 | //$icao = $Translation->checkTranslation($ident); |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | } |
| 462 | 462 | } |
| 463 | 463 | if (!$found) { |
| 464 | - $n = sscanf($message,'MET01%4c',$airport); |
|
| 464 | + $n = sscanf($message, 'MET01%4c', $airport); |
|
| 465 | 465 | if ($n == 1) { |
| 466 | 466 | if ($globalDebug) echo 'airport name : '.$airport; |
| 467 | 467 | $decode = array('Airport/Waypoint name' => $airport); |
@@ -469,241 +469,241 @@ discard block |
||
| 469 | 469 | } |
| 470 | 470 | } |
| 471 | 471 | if ($label == 'H1') { |
| 472 | - if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) { |
|
| 473 | - $decode = array_merge(array('Message nature' => 'Equipment failure'),$decode); |
|
| 472 | + if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) { |
|
| 473 | + $decode = array_merge(array('Message nature' => 'Equipment failure'), $decode); |
|
| 474 | 474 | } |
| 475 | - elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) { |
|
| 476 | - $decode = array_merge(array('Message nature' => 'Take off performance data'),$decode); |
|
| 475 | + elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) { |
|
| 476 | + $decode = array_merge(array('Message nature' => 'Take off performance data'), $decode); |
|
| 477 | 477 | } |
| 478 | - elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) { |
|
| 479 | - $decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode); |
|
| 478 | + elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) { |
|
| 479 | + $decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode); |
|
| 480 | 480 | } |
| 481 | - elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) { |
|
| 482 | - $decode = array_merge(array('Message nature' => 'Weather observation'),$decode); |
|
| 481 | + elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) { |
|
| 482 | + $decode = array_merge(array('Message nature' => 'Weather observation'), $decode); |
|
| 483 | 483 | } |
| 484 | - elseif (preg_match(':^#DFB/PIREP:',$message)) { |
|
| 485 | - $decode = array_merge(array('Message nature' => 'Pilot Report'),$decode); |
|
| 484 | + elseif (preg_match(':^#DFB/PIREP:', $message)) { |
|
| 485 | + $decode = array_merge(array('Message nature' => 'Pilot Report'), $decode); |
|
| 486 | 486 | } |
| 487 | - elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) { |
|
| 488 | - $decode = array_merge(array('Message nature' => 'Engine Data'),$decode); |
|
| 487 | + elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) { |
|
| 488 | + $decode = array_merge(array('Message nature' => 'Engine Data'), $decode); |
|
| 489 | 489 | } |
| 490 | - elseif (preg_match(':^#M1AAEP:',$message)) { |
|
| 491 | - $decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode); |
|
| 490 | + elseif (preg_match(':^#M1AAEP:', $message)) { |
|
| 491 | + $decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode); |
|
| 492 | 492 | } |
| 493 | - elseif (preg_match(':^#M2APWD:',$message)) { |
|
| 494 | - $decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode); |
|
| 493 | + elseif (preg_match(':^#M2APWD:', $message)) { |
|
| 494 | + $decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode); |
|
| 495 | 495 | } |
| 496 | - elseif (preg_match(':^#M1BREQPWI:',$message)) { |
|
| 497 | - $decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode); |
|
| 496 | + elseif (preg_match(':^#M1BREQPWI:', $message)) { |
|
| 497 | + $decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode); |
|
| 498 | 498 | } |
| 499 | - elseif (preg_match(':^#CF:',$message)) { |
|
| 500 | - $decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode); |
|
| 499 | + elseif (preg_match(':^#CF:', $message)) { |
|
| 500 | + $decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode); |
|
| 501 | 501 | } |
| 502 | - elseif (preg_match(':^#DF:',$message)) { |
|
| 503 | - $decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode); |
|
| 502 | + elseif (preg_match(':^#DF:', $message)) { |
|
| 503 | + $decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode); |
|
| 504 | 504 | } |
| 505 | - elseif (preg_match(':^#EC:',$message)) { |
|
| 506 | - $decode = array_merge(array('Message nature' => 'Engine Display System'),$decode); |
|
| 505 | + elseif (preg_match(':^#EC:', $message)) { |
|
| 506 | + $decode = array_merge(array('Message nature' => 'Engine Display System'), $decode); |
|
| 507 | 507 | } |
| 508 | - elseif (preg_match(':^#EI:',$message)) { |
|
| 509 | - $decode = array_merge(array('Message nature' => 'Engine Report'),$decode); |
|
| 508 | + elseif (preg_match(':^#EI:', $message)) { |
|
| 509 | + $decode = array_merge(array('Message nature' => 'Engine Report'), $decode); |
|
| 510 | 510 | } |
| 511 | - elseif (preg_match(':^#H1:',$message)) { |
|
| 512 | - $decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode); |
|
| 511 | + elseif (preg_match(':^#H1:', $message)) { |
|
| 512 | + $decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode); |
|
| 513 | 513 | } |
| 514 | - elseif (preg_match(':^#H2:',$message)) { |
|
| 515 | - $decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode); |
|
| 514 | + elseif (preg_match(':^#H2:', $message)) { |
|
| 515 | + $decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode); |
|
| 516 | 516 | } |
| 517 | - elseif (preg_match(':^#HD:',$message)) { |
|
| 518 | - $decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode); |
|
| 517 | + elseif (preg_match(':^#HD:', $message)) { |
|
| 518 | + $decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode); |
|
| 519 | 519 | } |
| 520 | - elseif (preg_match(':^#M1:',$message)) { |
|
| 521 | - $decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode); |
|
| 520 | + elseif (preg_match(':^#M1:', $message)) { |
|
| 521 | + $decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode); |
|
| 522 | 522 | } |
| 523 | - elseif (preg_match(':^#M2:',$message)) { |
|
| 524 | - $decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode); |
|
| 523 | + elseif (preg_match(':^#M2:', $message)) { |
|
| 524 | + $decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode); |
|
| 525 | 525 | } |
| 526 | - elseif (preg_match(':^#M3:',$message)) { |
|
| 527 | - $decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode); |
|
| 526 | + elseif (preg_match(':^#M3:', $message)) { |
|
| 527 | + $decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode); |
|
| 528 | 528 | } |
| 529 | - elseif (preg_match(':^#MD:',$message)) { |
|
| 530 | - $decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode); |
|
| 529 | + elseif (preg_match(':^#MD:', $message)) { |
|
| 530 | + $decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode); |
|
| 531 | 531 | } |
| 532 | - elseif (preg_match(':^#PS:',$message)) { |
|
| 533 | - $decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode); |
|
| 532 | + elseif (preg_match(':^#PS:', $message)) { |
|
| 533 | + $decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode); |
|
| 534 | 534 | } |
| 535 | - elseif (preg_match(':^#S1:',$message)) { |
|
| 536 | - $decode = array_merge(array('Message nature' => 'SDU - Left'),$decode); |
|
| 535 | + elseif (preg_match(':^#S1:', $message)) { |
|
| 536 | + $decode = array_merge(array('Message nature' => 'SDU - Left'), $decode); |
|
| 537 | 537 | } |
| 538 | - elseif (preg_match(':^#S2:',$message)) { |
|
| 539 | - $decode = array_merge(array('Message nature' => 'SDU - Right'),$decode); |
|
| 538 | + elseif (preg_match(':^#S2:', $message)) { |
|
| 539 | + $decode = array_merge(array('Message nature' => 'SDU - Right'), $decode); |
|
| 540 | 540 | } |
| 541 | - elseif (preg_match(':^#SD:',$message)) { |
|
| 542 | - $decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode); |
|
| 541 | + elseif (preg_match(':^#SD:', $message)) { |
|
| 542 | + $decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode); |
|
| 543 | 543 | } |
| 544 | - elseif (preg_match(':^#T[0-8]:',$message)) { |
|
| 545 | - $decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode); |
|
| 544 | + elseif (preg_match(':^#T[0-8]:', $message)) { |
|
| 545 | + $decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode); |
|
| 546 | 546 | } |
| 547 | - elseif (preg_match(':^#WO:',$message)) { |
|
| 548 | - $decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode); |
|
| 547 | + elseif (preg_match(':^#WO:', $message)) { |
|
| 548 | + $decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode); |
|
| 549 | 549 | } |
| 550 | - elseif (preg_match(':^#A1:',$message)) { |
|
| 551 | - $decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode); |
|
| 550 | + elseif (preg_match(':^#A1:', $message)) { |
|
| 551 | + $decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode); |
|
| 552 | 552 | } |
| 553 | - elseif (preg_match(':^#A3:',$message)) { |
|
| 554 | - $decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode); |
|
| 553 | + elseif (preg_match(':^#A3:', $message)) { |
|
| 554 | + $decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode); |
|
| 555 | 555 | } |
| 556 | - elseif (preg_match(':^#A4:',$message)) { |
|
| 557 | - $decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode); |
|
| 556 | + elseif (preg_match(':^#A4:', $message)) { |
|
| 557 | + $decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode); |
|
| 558 | 558 | } |
| 559 | - elseif (preg_match(':^#A6:',$message)) { |
|
| 560 | - $decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode); |
|
| 559 | + elseif (preg_match(':^#A6:', $message)) { |
|
| 560 | + $decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode); |
|
| 561 | 561 | } |
| 562 | - elseif (preg_match(':^#A8:',$message)) { |
|
| 563 | - $decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode); |
|
| 562 | + elseif (preg_match(':^#A8:', $message)) { |
|
| 563 | + $decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode); |
|
| 564 | 564 | } |
| 565 | - elseif (preg_match(':^#A9:',$message)) { |
|
| 566 | - $decode = array_merge(array('Message nature' => 'ATIS report'),$decode); |
|
| 565 | + elseif (preg_match(':^#A9:', $message)) { |
|
| 566 | + $decode = array_merge(array('Message nature' => 'ATIS report'), $decode); |
|
| 567 | 567 | } |
| 568 | - elseif (preg_match(':^#A0:',$message)) { |
|
| 569 | - $decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode); |
|
| 568 | + elseif (preg_match(':^#A0:', $message)) { |
|
| 569 | + $decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode); |
|
| 570 | 570 | } |
| 571 | - elseif (preg_match(':^#AA:',$message)) { |
|
| 572 | - $decode = array_merge(array('Message nature' => 'ATCComm'),$decode); |
|
| 571 | + elseif (preg_match(':^#AA:', $message)) { |
|
| 572 | + $decode = array_merge(array('Message nature' => 'ATCComm'), $decode); |
|
| 573 | 573 | } |
| 574 | - elseif (preg_match(':^#AB:',$message)) { |
|
| 575 | - $decode = array_merge(array('Message nature' => 'TWIP Report'),$decode); |
|
| 574 | + elseif (preg_match(':^#AB:', $message)) { |
|
| 575 | + $decode = array_merge(array('Message nature' => 'TWIP Report'), $decode); |
|
| 576 | 576 | } |
| 577 | - elseif (preg_match(':^#AC:',$message)) { |
|
| 578 | - $decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode); |
|
| 577 | + elseif (preg_match(':^#AC:', $message)) { |
|
| 578 | + $decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode); |
|
| 579 | 579 | } |
| 580 | - elseif (preg_match(':^#AD:',$message)) { |
|
| 581 | - $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode); |
|
| 580 | + elseif (preg_match(':^#AD:', $message)) { |
|
| 581 | + $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode); |
|
| 582 | 582 | } |
| 583 | - elseif (preg_match(':^#AF:',$message)) { |
|
| 584 | - $decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode); |
|
| 583 | + elseif (preg_match(':^#AF:', $message)) { |
|
| 584 | + $decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode); |
|
| 585 | 585 | } |
| 586 | - elseif (preg_match(':^#B1:',$message)) { |
|
| 587 | - $decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode); |
|
| 586 | + elseif (preg_match(':^#B1:', $message)) { |
|
| 587 | + $decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode); |
|
| 588 | 588 | } |
| 589 | - elseif (preg_match(':^#B2:',$message)) { |
|
| 590 | - $decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode); |
|
| 589 | + elseif (preg_match(':^#B2:', $message)) { |
|
| 590 | + $decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode); |
|
| 591 | 591 | } |
| 592 | - elseif (preg_match(':^#B3:',$message)) { |
|
| 593 | - $decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode); |
|
| 592 | + elseif (preg_match(':^#B3:', $message)) { |
|
| 593 | + $decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode); |
|
| 594 | 594 | } |
| 595 | - elseif (preg_match(':^#B4:',$message)) { |
|
| 596 | - $decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode); |
|
| 595 | + elseif (preg_match(':^#B4:', $message)) { |
|
| 596 | + $decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode); |
|
| 597 | 597 | } |
| 598 | - elseif (preg_match(':^#B6:',$message)) { |
|
| 599 | - $decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode); |
|
| 598 | + elseif (preg_match(':^#B6:', $message)) { |
|
| 599 | + $decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode); |
|
| 600 | 600 | } |
| 601 | - elseif (preg_match(':^#B8:',$message)) { |
|
| 602 | - $decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode); |
|
| 601 | + elseif (preg_match(':^#B8:', $message)) { |
|
| 602 | + $decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode); |
|
| 603 | 603 | } |
| 604 | - elseif (preg_match(':^#B9:',$message)) { |
|
| 605 | - $decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode); |
|
| 604 | + elseif (preg_match(':^#B9:', $message)) { |
|
| 605 | + $decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode); |
|
| 606 | 606 | } |
| 607 | - elseif (preg_match(':^#B0:',$message)) { |
|
| 608 | - $decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode); |
|
| 607 | + elseif (preg_match(':^#B0:', $message)) { |
|
| 608 | + $decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode); |
|
| 609 | 609 | } |
| 610 | - elseif (preg_match(':^#BA:',$message)) { |
|
| 611 | - $decode = array_merge(array('Message nature' => 'ATCComm'),$decode); |
|
| 610 | + elseif (preg_match(':^#BA:', $message)) { |
|
| 611 | + $decode = array_merge(array('Message nature' => 'ATCComm'), $decode); |
|
| 612 | 612 | } |
| 613 | - elseif (preg_match(':^#BB:',$message)) { |
|
| 614 | - $decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode); |
|
| 613 | + elseif (preg_match(':^#BB:', $message)) { |
|
| 614 | + $decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode); |
|
| 615 | 615 | } |
| 616 | - elseif (preg_match(':^#BC:',$message)) { |
|
| 617 | - $decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode); |
|
| 616 | + elseif (preg_match(':^#BC:', $message)) { |
|
| 617 | + $decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode); |
|
| 618 | 618 | } |
| 619 | - elseif (preg_match(':^#BD:',$message)) { |
|
| 620 | - $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode); |
|
| 619 | + elseif (preg_match(':^#BD:', $message)) { |
|
| 620 | + $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode); |
|
| 621 | 621 | } |
| 622 | - elseif (preg_match(':^#BE:',$message)) { |
|
| 623 | - $decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode); |
|
| 622 | + elseif (preg_match(':^#BE:', $message)) { |
|
| 623 | + $decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode); |
|
| 624 | 624 | } |
| 625 | - elseif (preg_match(':^#BF:',$message)) { |
|
| 626 | - $decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode); |
|
| 625 | + elseif (preg_match(':^#BF:', $message)) { |
|
| 626 | + $decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode); |
|
| 627 | 627 | } |
| 628 | - elseif (preg_match(':^#H3:',$message)) { |
|
| 629 | - $decode = array_merge(array('Message nature' => 'Icing Report'),$decode); |
|
| 628 | + elseif (preg_match(':^#H3:', $message)) { |
|
| 629 | + $decode = array_merge(array('Message nature' => 'Icing Report'), $decode); |
|
| 630 | 630 | } |
| 631 | 631 | } |
| 632 | 632 | if ($label == '10') { |
| 633 | - if (preg_match(':^DTO01:',$message)) { |
|
| 634 | - $decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode); |
|
| 633 | + if (preg_match(':^DTO01:', $message)) { |
|
| 634 | + $decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode); |
|
| 635 | 635 | } |
| 636 | - elseif (preg_match(':^AIS01:',$message)) { |
|
| 637 | - $decode = array_merge(array('Message nature' => 'AIS Request'),$decode); |
|
| 636 | + elseif (preg_match(':^AIS01:', $message)) { |
|
| 637 | + $decode = array_merge(array('Message nature' => 'AIS Request'), $decode); |
|
| 638 | 638 | } |
| 639 | - elseif (preg_match(':^FTX01:',$message)) { |
|
| 640 | - $decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode); |
|
| 639 | + elseif (preg_match(':^FTX01:', $message)) { |
|
| 640 | + $decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode); |
|
| 641 | 641 | } |
| 642 | - elseif (preg_match(':^FPL01:',$message)) { |
|
| 643 | - $decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode); |
|
| 642 | + elseif (preg_match(':^FPL01:', $message)) { |
|
| 643 | + $decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode); |
|
| 644 | 644 | } |
| 645 | - elseif (preg_match(':^WAB01:',$message)) { |
|
| 646 | - $decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode); |
|
| 645 | + elseif (preg_match(':^WAB01:', $message)) { |
|
| 646 | + $decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode); |
|
| 647 | 647 | } |
| 648 | - elseif (preg_match(':^MET01:',$message)) { |
|
| 649 | - $decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode); |
|
| 648 | + elseif (preg_match(':^MET01:', $message)) { |
|
| 649 | + $decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode); |
|
| 650 | 650 | } |
| 651 | - elseif (preg_match(':^WAB02:',$message)) { |
|
| 652 | - $decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode); |
|
| 651 | + elseif (preg_match(':^WAB02:', $message)) { |
|
| 652 | + $decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode); |
|
| 653 | 653 | } |
| 654 | 654 | } |
| 655 | 655 | if ($label == '15') { |
| 656 | - if (preg_match(':^FST01:',$message)) { |
|
| 657 | - $decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode); |
|
| 656 | + if (preg_match(':^FST01:', $message)) { |
|
| 657 | + $decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode); |
|
| 658 | 658 | } |
| 659 | 659 | } |
| 660 | 660 | if (!$found && $label == 'SA') { |
| 661 | - $n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at); |
|
| 661 | + $n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at); |
|
| 662 | 662 | if ($n == 4) { |
| 663 | 663 | $vsta = array('Version' => $version); |
| 664 | 664 | if ($state == 'E') { |
| 665 | - $vsta = array_merge($vsta,array('Link state' => 'Established')); |
|
| 665 | + $vsta = array_merge($vsta, array('Link state' => 'Established')); |
|
| 666 | 666 | } |
| 667 | 667 | elseif ($state == 'L') { |
| 668 | - $vsta = array_merge($vsta,array('Link state' => 'Lost')); |
|
| 668 | + $vsta = array_merge($vsta, array('Link state' => 'Lost')); |
|
| 669 | 669 | } |
| 670 | 670 | else { |
| 671 | - $vsta = array_merge($vsta,array('Link state' => 'Unknown')); |
|
| 671 | + $vsta = array_merge($vsta, array('Link state' => 'Unknown')); |
|
| 672 | 672 | } |
| 673 | 673 | if ($type == 'V') { |
| 674 | - $vsta = array_merge($vsta,array('Link type' => 'VHF ACARS')); |
|
| 674 | + $vsta = array_merge($vsta, array('Link type' => 'VHF ACARS')); |
|
| 675 | 675 | } |
| 676 | 676 | elseif ($type == 'S') { |
| 677 | - $vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM')); |
|
| 677 | + $vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM')); |
|
| 678 | 678 | } |
| 679 | 679 | elseif ($type == 'H') { |
| 680 | - $vsta = array_merge($vsta,array('Link type' => 'HF')); |
|
| 680 | + $vsta = array_merge($vsta, array('Link type' => 'HF')); |
|
| 681 | 681 | } |
| 682 | 682 | elseif ($type == 'G') { |
| 683 | - $vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM')); |
|
| 683 | + $vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM')); |
|
| 684 | 684 | } |
| 685 | 685 | elseif ($type == 'C') { |
| 686 | - $vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM')); |
|
| 686 | + $vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM')); |
|
| 687 | 687 | } |
| 688 | 688 | elseif ($type == '2') { |
| 689 | - $vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2')); |
|
| 689 | + $vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2')); |
|
| 690 | 690 | } |
| 691 | 691 | elseif ($type == 'X') { |
| 692 | - $vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero')); |
|
| 692 | + $vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero')); |
|
| 693 | 693 | } |
| 694 | 694 | elseif ($type == 'I') { |
| 695 | - $vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM')); |
|
| 695 | + $vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM')); |
|
| 696 | 696 | } |
| 697 | 697 | else { |
| 698 | - $vsta = array_merge($vsta,array('Link type' => 'Unknown')); |
|
| 698 | + $vsta = array_merge($vsta, array('Link type' => 'Unknown')); |
|
| 699 | 699 | } |
| 700 | - $vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2)))); |
|
| 701 | - $decode = array_merge($vsta,$decode); |
|
| 700 | + $vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2)))); |
|
| 701 | + $decode = array_merge($vsta, $decode); |
|
| 702 | 702 | } |
| 703 | 703 | } |
| 704 | 704 | |
| 705 | 705 | $title = $this->getTitlefromLabel($label); |
| 706 | - if ($title != '') $decode = array_merge(array('Message title' => $title),$decode); |
|
| 706 | + if ($title != '') $decode = array_merge(array('Message title' => $title), $decode); |
|
| 707 | 707 | /* |
| 708 | 708 | // Business jets always use GS0001 |
| 709 | 709 | if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude); |
@@ -731,13 +731,13 @@ discard block |
||
| 731 | 731 | $Translation = new Translation($this->db); |
| 732 | 732 | $message = $this->parse($data); |
| 733 | 733 | if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') { |
| 734 | - $ident = (string)$message['ident']; |
|
| 734 | + $ident = (string) $message['ident']; |
|
| 735 | 735 | $label = $message['label']; |
| 736 | 736 | $block_id = $message['block_id']; |
| 737 | 737 | $msg_no = $message['msg_no']; |
| 738 | 738 | $msg = $message['message']; |
| 739 | 739 | $decode = $message['decode']; |
| 740 | - $registration = (string)$message['registration']; |
|
| 740 | + $registration = (string) $message['registration']; |
|
| 741 | 741 | if (isset($decode['latitude'])) $latitude = $decode['latitude']; |
| 742 | 742 | else $latitude = ''; |
| 743 | 743 | if (isset($decode['longitude'])) $longitude = $decode['longitude']; |
@@ -751,20 +751,20 @@ discard block |
||
| 751 | 751 | $Image->addSpotterImage($registration); |
| 752 | 752 | } |
| 753 | 753 | // Business jets always use GS0001 |
| 754 | - if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude); |
|
| 754 | + if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude); |
|
| 755 | 755 | if ($globalDebug && isset($info) && $info != '') echo $info; |
| 756 | 756 | if (count($decode) > 0) $decode_json = json_encode($decode); |
| 757 | 757 | else $decode_json = ''; |
| 758 | 758 | if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) { |
| 759 | - $Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS'); |
|
| 759 | + $Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS'); |
|
| 760 | 760 | } elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) { |
| 761 | - $Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS'); |
|
| 761 | + $Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS'); |
|
| 762 | 762 | } |
| 763 | - $result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json); |
|
| 764 | - if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F'); |
|
| 765 | - if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json); |
|
| 763 | + $result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json); |
|
| 764 | + if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F'); |
|
| 765 | + if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json); |
|
| 766 | 766 | if ($globalDebug && count($decode) > 0) { |
| 767 | - echo "Human readable data : ".implode(' - ',$decode)."\n"; |
|
| 767 | + echo "Human readable data : ".implode(' - ', $decode)."\n"; |
|
| 768 | 768 | } |
| 769 | 769 | } |
| 770 | 770 | } |
@@ -779,7 +779,7 @@ discard block |
||
| 779 | 779 | * @param String $msg_no Number of the ACARS message |
| 780 | 780 | * @param String $message ACARS message |
| 781 | 781 | */ |
| 782 | - public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
|
| 782 | + public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') { |
|
| 783 | 783 | global $globalDebug; |
| 784 | 784 | date_default_timezone_set('UTC'); |
| 785 | 785 | if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') { |
@@ -787,21 +787,21 @@ discard block |
||
| 787 | 787 | $this->db = $Connection->db; |
| 788 | 788 | if ($globalDebug) echo "Test if not already in Live ACARS table..."; |
| 789 | 789 | $query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message"; |
| 790 | - $query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message); |
|
| 790 | + $query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message); |
|
| 791 | 791 | try { |
| 792 | 792 | $stht = $this->db->prepare($query_test); |
| 793 | 793 | $stht->execute($query_test_values); |
| 794 | - } catch(PDOException $e) { |
|
| 794 | + } catch (PDOException $e) { |
|
| 795 | 795 | return "error : ".$e->getMessage(); |
| 796 | 796 | } |
| 797 | 797 | if ($stht->fetchColumn() == 0) { |
| 798 | 798 | if ($globalDebug) echo "Add Live ACARS data..."; |
| 799 | 799 | $query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)"; |
| 800 | - $query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s")); |
|
| 800 | + $query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s")); |
|
| 801 | 801 | try { |
| 802 | 802 | $sth = $this->db->prepare($query); |
| 803 | 803 | $sth->execute($query_values); |
| 804 | - } catch(PDOException $e) { |
|
| 804 | + } catch (PDOException $e) { |
|
| 805 | 805 | return "error : ".$e->getMessage(); |
| 806 | 806 | } |
| 807 | 807 | } else { |
@@ -823,10 +823,10 @@ discard block |
||
| 823 | 823 | * @param String $msg_no Number of the ACARS message |
| 824 | 824 | * @param String $message ACARS message |
| 825 | 825 | */ |
| 826 | - public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
|
| 826 | + public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') { |
|
| 827 | 827 | global $globalDebug; |
| 828 | 828 | date_default_timezone_set('UTC'); |
| 829 | - if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) { |
|
| 829 | + if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) { |
|
| 830 | 830 | /* |
| 831 | 831 | if ($globalDebug) echo "Test if not already in Archive ACARS table..."; |
| 832 | 832 | $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message"; |
@@ -841,11 +841,11 @@ discard block |
||
| 841 | 841 | */ |
| 842 | 842 | if ($globalDebug) echo "Add Live ACARS data..."; |
| 843 | 843 | $query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)"; |
| 844 | - $query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode); |
|
| 844 | + $query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode); |
|
| 845 | 845 | try { |
| 846 | 846 | $sth = $this->db->prepare($query); |
| 847 | 847 | $sth->execute($query_values); |
| 848 | - } catch(PDOException $e) { |
|
| 848 | + } catch (PDOException $e) { |
|
| 849 | 849 | return "error : ".$e->getMessage(); |
| 850 | 850 | } |
| 851 | 851 | if ($globalDebug) echo "Done\n"; |
@@ -866,7 +866,7 @@ discard block |
||
| 866 | 866 | try { |
| 867 | 867 | $sth = $this->db->prepare($query); |
| 868 | 868 | $sth->execute($query_values); |
| 869 | - } catch(PDOException $e) { |
|
| 869 | + } catch (PDOException $e) { |
|
| 870 | 870 | echo "error : ".$e->getMessage(); |
| 871 | 871 | die; |
| 872 | 872 | } |
@@ -886,7 +886,7 @@ discard block |
||
| 886 | 886 | try { |
| 887 | 887 | $sth = $this->db->prepare($query); |
| 888 | 888 | $sth->execute($query_values); |
| 889 | - } catch(PDOException $e) { |
|
| 889 | + } catch (PDOException $e) { |
|
| 890 | 890 | echo "error : ".$e->getMessage(); |
| 891 | 891 | die; |
| 892 | 892 | } |
@@ -907,7 +907,7 @@ discard block |
||
| 907 | 907 | try { |
| 908 | 908 | $sth = $this->db->prepare($query); |
| 909 | 909 | $sth->execute($query_values); |
| 910 | - } catch(PDOException $e) { |
|
| 910 | + } catch (PDOException $e) { |
|
| 911 | 911 | echo "error : ".$e->getMessage(); |
| 912 | 912 | die; |
| 913 | 913 | } |
@@ -921,7 +921,7 @@ discard block |
||
| 921 | 921 | * |
| 922 | 922 | * @return Array Return ACARS data in array |
| 923 | 923 | */ |
| 924 | - public function getLatestAcarsData($limit = '',$label = '') { |
|
| 924 | + public function getLatestAcarsData($limit = '', $label = '') { |
|
| 925 | 925 | global $globalURL, $globalDBdriver; |
| 926 | 926 | $Image = new Image($this->db); |
| 927 | 927 | $Spotter = new Spotter($this->db); |
@@ -932,8 +932,8 @@ discard block |
||
| 932 | 932 | if ($limit != "") |
| 933 | 933 | { |
| 934 | 934 | $limit_array = explode(",", $limit); |
| 935 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 936 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 935 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 936 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 937 | 937 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 938 | 938 | { |
| 939 | 939 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -949,46 +949,46 @@ discard block |
||
| 949 | 949 | try { |
| 950 | 950 | $sth = $this->db->prepare($query); |
| 951 | 951 | $sth->execute($query_values); |
| 952 | - } catch(PDOException $e) { |
|
| 952 | + } catch (PDOException $e) { |
|
| 953 | 953 | return "error : ".$e->getMessage(); |
| 954 | 954 | } |
| 955 | 955 | $i = 0; |
| 956 | 956 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 957 | 957 | $data = array(); |
| 958 | 958 | if ($row['registration'] != '') { |
| 959 | - $row['registration'] = str_replace('.','',$row['registration']); |
|
| 959 | + $row['registration'] = str_replace('.', '', $row['registration']); |
|
| 960 | 960 | $image_array = $Image->getSpotterImage($row['registration']); |
| 961 | - if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 962 | - else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 963 | - } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 961 | + if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 962 | + else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 963 | + } else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 964 | 964 | if ($row['registration'] == '') $row['registration'] = 'NA'; |
| 965 | 965 | if ($row['ident'] == '') $row['ident'] = 'NA'; |
| 966 | - $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2)); |
|
| 966 | + $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2)); |
|
| 967 | 967 | if (isset($identicao[0])) { |
| 968 | - if (substr($row['ident'],0,2) == 'AF') { |
|
| 969 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 970 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 971 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 972 | - $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
|
| 968 | + if (substr($row['ident'], 0, 2) == 'AF') { |
|
| 969 | + if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 970 | + else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0'); |
|
| 971 | + } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0'); |
|
| 972 | + $data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name'])); |
|
| 973 | 973 | } else $icao = $row['ident']; |
| 974 | - $icao = $Translation->checkTranslation($icao,false); |
|
| 975 | - $decode = json_decode($row['decode'],true); |
|
| 974 | + $icao = $Translation->checkTranslation($icao, false); |
|
| 975 | + $decode = json_decode($row['decode'], true); |
|
| 976 | 976 | $found = false; |
| 977 | - if ($decode != '' && array_key_exists('Departure airport',$decode)) { |
|
| 977 | + if ($decode != '' && array_key_exists('Departure airport', $decode)) { |
|
| 978 | 978 | $airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']); |
| 979 | 979 | if (isset($airport_info[0]['icao'])) { |
| 980 | 980 | $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
| 981 | 981 | $found = true; |
| 982 | 982 | } |
| 983 | 983 | } |
| 984 | - if ($decode != '' && array_key_exists('Arrival airport',$decode)) { |
|
| 984 | + if ($decode != '' && array_key_exists('Arrival airport', $decode)) { |
|
| 985 | 985 | $airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']); |
| 986 | 986 | if (isset($airport_info[0]['icao'])) { |
| 987 | 987 | $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
| 988 | 988 | $found = true; |
| 989 | 989 | } |
| 990 | 990 | } |
| 991 | - if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) { |
|
| 991 | + if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) { |
|
| 992 | 992 | $airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']); |
| 993 | 993 | if (isset($airport_info[0]['icao'])) { |
| 994 | 994 | $decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
@@ -996,7 +996,7 @@ discard block |
||
| 996 | 996 | } |
| 997 | 997 | } |
| 998 | 998 | if ($found) $row['decode'] = json_encode($decode); |
| 999 | - $data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
|
| 999 | + $data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
|
| 1000 | 1000 | $result[] = $data; |
| 1001 | 1001 | $i++; |
| 1002 | 1002 | } |
@@ -1012,7 +1012,7 @@ discard block |
||
| 1012 | 1012 | * |
| 1013 | 1013 | * @return Array Return ACARS data in array |
| 1014 | 1014 | */ |
| 1015 | - public function getArchiveAcarsData($limit = '',$label = '') { |
|
| 1015 | + public function getArchiveAcarsData($limit = '', $label = '') { |
|
| 1016 | 1016 | global $globalURL, $globalDBdriver; |
| 1017 | 1017 | $Image = new Image($this->db); |
| 1018 | 1018 | $Spotter = new Spotter($this->db); |
@@ -1022,8 +1022,8 @@ discard block |
||
| 1022 | 1022 | if ($limit != "") |
| 1023 | 1023 | { |
| 1024 | 1024 | $limit_array = explode(",", $limit); |
| 1025 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1026 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1025 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1026 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1027 | 1027 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1028 | 1028 | { |
| 1029 | 1029 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -1044,43 +1044,43 @@ discard block |
||
| 1044 | 1044 | try { |
| 1045 | 1045 | $sth = $this->db->prepare($query); |
| 1046 | 1046 | $sth->execute($query_values); |
| 1047 | - } catch(PDOException $e) { |
|
| 1047 | + } catch (PDOException $e) { |
|
| 1048 | 1048 | return "error : ".$e->getMessage(); |
| 1049 | 1049 | } |
| 1050 | - $i=0; |
|
| 1050 | + $i = 0; |
|
| 1051 | 1051 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 1052 | 1052 | $data = array(); |
| 1053 | 1053 | if ($row['registration'] != '') { |
| 1054 | - $row['registration'] = str_replace('.','',$row['registration']); |
|
| 1054 | + $row['registration'] = str_replace('.', '', $row['registration']); |
|
| 1055 | 1055 | $image_array = $Image->getSpotterImage($row['registration']); |
| 1056 | - if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 1057 | - else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1058 | - } else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1056 | + if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 1057 | + else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 1058 | + } else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 1059 | 1059 | $icao = ''; |
| 1060 | 1060 | if ($row['registration'] == '') $row['registration'] = 'NA'; |
| 1061 | 1061 | if ($row['ident'] == '') $row['ident'] = 'NA'; |
| 1062 | - $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2)); |
|
| 1062 | + $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2)); |
|
| 1063 | 1063 | if (isset($identicao[0])) { |
| 1064 | - if (substr($row['ident'],0,2) == 'AF') { |
|
| 1065 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 1066 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 1067 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 1068 | - $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
|
| 1064 | + if (substr($row['ident'], 0, 2) == 'AF') { |
|
| 1065 | + if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 1066 | + else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0'); |
|
| 1067 | + } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0'); |
|
| 1068 | + $data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name'])); |
|
| 1069 | 1069 | } else $icao = $row['ident']; |
| 1070 | 1070 | $icao = $Translation->checkTranslation($icao); |
| 1071 | - $decode = json_decode($row['decode'],true); |
|
| 1071 | + $decode = json_decode($row['decode'], true); |
|
| 1072 | 1072 | $found = false; |
| 1073 | - if ($decode != '' && array_key_exists('Departure airport',$decode)) { |
|
| 1073 | + if ($decode != '' && array_key_exists('Departure airport', $decode)) { |
|
| 1074 | 1074 | $airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']); |
| 1075 | 1075 | if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
| 1076 | 1076 | $found = true; |
| 1077 | 1077 | } |
| 1078 | - if ($decode != '' && array_key_exists('Arrival airport',$decode)) { |
|
| 1078 | + if ($decode != '' && array_key_exists('Arrival airport', $decode)) { |
|
| 1079 | 1079 | $airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']); |
| 1080 | 1080 | if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
| 1081 | 1081 | $found = true; |
| 1082 | 1082 | } |
| 1083 | - if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) { |
|
| 1083 | + if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) { |
|
| 1084 | 1084 | $airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']); |
| 1085 | 1085 | if (isset($airport_info[0]['icao'])) { |
| 1086 | 1086 | $decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
@@ -1088,7 +1088,7 @@ discard block |
||
| 1088 | 1088 | } |
| 1089 | 1089 | } |
| 1090 | 1090 | if ($found) $row['decode'] = json_encode($decode); |
| 1091 | - $data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
|
| 1091 | + $data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
|
| 1092 | 1092 | $result[] = $data; |
| 1093 | 1093 | $i++; |
| 1094 | 1094 | } |
@@ -1106,7 +1106,7 @@ discard block |
||
| 1106 | 1106 | * @param String $icao |
| 1107 | 1107 | * @param String $ICAOTypeCode |
| 1108 | 1108 | */ |
| 1109 | - public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') { |
|
| 1109 | + public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') { |
|
| 1110 | 1110 | global $globalDebug, $globalDBdriver; |
| 1111 | 1111 | $ident = trim($ident); |
| 1112 | 1112 | $Translation = new Translation($this->db); |
@@ -1119,7 +1119,7 @@ discard block |
||
| 1119 | 1119 | if ($globalDebug) echo "Ident or registration null, exit\n"; |
| 1120 | 1120 | return ''; |
| 1121 | 1121 | } |
| 1122 | - $registration = str_replace('.','',$registration); |
|
| 1122 | + $registration = str_replace('.', '', $registration); |
|
| 1123 | 1123 | $ident = $Translation->ident2icao($ident); |
| 1124 | 1124 | // Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation |
| 1125 | 1125 | if ($globalDebug) echo "Check if needed to add translation ".$ident.'... '; |
@@ -1128,7 +1128,7 @@ discard block |
||
| 1128 | 1128 | try { |
| 1129 | 1129 | $sthsi = $this->db->prepare($querysi); |
| 1130 | 1130 | $sthsi->execute($querysi_values); |
| 1131 | - } catch(PDOException $e) { |
|
| 1131 | + } catch (PDOException $e) { |
|
| 1132 | 1132 | if ($globalDebug) echo $e->getMessage(); |
| 1133 | 1133 | return "error : ".$e->getMessage(); |
| 1134 | 1134 | } |
@@ -1138,8 +1138,8 @@ discard block |
||
| 1138 | 1138 | $Translation = new Translation($this->db); |
| 1139 | 1139 | $trans_ident = $Translation->getOperator($resultsi['ident']); |
| 1140 | 1140 | if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' '; |
| 1141 | - if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS'); |
|
| 1142 | - elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS'); |
|
| 1141 | + if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS'); |
|
| 1142 | + elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS'); |
|
| 1143 | 1143 | } else { |
| 1144 | 1144 | if ($registration != '' && $latitude != '' && $longitude != '') { |
| 1145 | 1145 | $query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1"; |
@@ -1147,7 +1147,7 @@ discard block |
||
| 1147 | 1147 | try { |
| 1148 | 1148 | $sth = $this->db->prepare($query); |
| 1149 | 1149 | $sth->execute($query_values); |
| 1150 | - } catch(PDOException $e) { |
|
| 1150 | + } catch (PDOException $e) { |
|
| 1151 | 1151 | if ($globalDebug) echo $e->getMessage(); |
| 1152 | 1152 | return "error : ".$e->getMessage(); |
| 1153 | 1153 | } |
@@ -1155,7 +1155,7 @@ discard block |
||
| 1155 | 1155 | $sth->closeCursor(); |
| 1156 | 1156 | if (isset($result['modes'])) $hex = $result['modes']; |
| 1157 | 1157 | else $hex = ''; |
| 1158 | - $SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS'); |
|
| 1158 | + $SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS'); |
|
| 1159 | 1159 | $this->SI->add($SI_data); |
| 1160 | 1160 | } |
| 1161 | 1161 | } |
@@ -1165,7 +1165,7 @@ discard block |
||
| 1165 | 1165 | try { |
| 1166 | 1166 | $sth = $this->db->prepare($query); |
| 1167 | 1167 | $sth->execute($query_values); |
| 1168 | - } catch(PDOException $e) { |
|
| 1168 | + } catch (PDOException $e) { |
|
| 1169 | 1169 | if ($globalDebug) echo $e->getMessage(); |
| 1170 | 1170 | return "error : ".$e->getMessage(); |
| 1171 | 1171 | } |
@@ -1175,7 +1175,7 @@ discard block |
||
| 1175 | 1175 | if (isset($result['ModeS'])) $ModeS = $result['ModeS']; |
| 1176 | 1176 | else $ModeS = ''; |
| 1177 | 1177 | if ($ModeS == '') { |
| 1178 | - $id = explode('-',$result['flightaware_id']); |
|
| 1178 | + $id = explode('-', $result['flightaware_id']); |
|
| 1179 | 1179 | $ModeS = $id[0]; |
| 1180 | 1180 | } |
| 1181 | 1181 | if ($ModeS != '') { |
@@ -1185,20 +1185,20 @@ discard block |
||
| 1185 | 1185 | try { |
| 1186 | 1186 | $sthc = $this->db->prepare($queryc); |
| 1187 | 1187 | $sthc->execute($queryc_values); |
| 1188 | - } catch(PDOException $e) { |
|
| 1188 | + } catch (PDOException $e) { |
|
| 1189 | 1189 | if ($globalDebug) echo $e->getMessage(); |
| 1190 | 1190 | return "error : ".$e->getMessage(); |
| 1191 | 1191 | } |
| 1192 | 1192 | $row = $sthc->fetch(PDO::FETCH_ASSOC); |
| 1193 | 1193 | $sthc->closeCursor(); |
| 1194 | - if (count($row) == 0) { |
|
| 1194 | + if (count($row) == 0) { |
|
| 1195 | 1195 | if ($globalDebug) echo " Add to ModeS table - "; |
| 1196 | 1196 | $queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')"; |
| 1197 | - $queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
|
| 1197 | + $queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
|
| 1198 | 1198 | try { |
| 1199 | 1199 | $sthi = $this->db->prepare($queryi); |
| 1200 | 1200 | $sthi->execute($queryi_values); |
| 1201 | - } catch(PDOException $e) { |
|
| 1201 | + } catch (PDOException $e) { |
|
| 1202 | 1202 | if ($globalDebug) echo $e->getMessage(); |
| 1203 | 1203 | return "error : ".$e->getMessage(); |
| 1204 | 1204 | } |
@@ -1206,15 +1206,15 @@ discard block |
||
| 1206 | 1206 | if ($globalDebug) echo " Update ModeS table - "; |
| 1207 | 1207 | if ($ICAOTypeCode != '') { |
| 1208 | 1208 | $queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS"; |
| 1209 | - $queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
|
| 1209 | + $queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
|
| 1210 | 1210 | } else { |
| 1211 | 1211 | $queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS"; |
| 1212 | - $queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration); |
|
| 1212 | + $queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration); |
|
| 1213 | 1213 | } |
| 1214 | 1214 | try { |
| 1215 | 1215 | $sthi = $this->db->prepare($queryi); |
| 1216 | 1216 | $sthi->execute($queryi_values); |
| 1217 | - } catch(PDOException $e) { |
|
| 1217 | + } catch (PDOException $e) { |
|
| 1218 | 1218 | if ($globalDebug) echo $e->getMessage(); |
| 1219 | 1219 | return "error : ".$e->getMessage(); |
| 1220 | 1220 | } |
@@ -1251,12 +1251,12 @@ discard block |
||
| 1251 | 1251 | elseif ($globalDBdriver == 'pgsql') { |
| 1252 | 1252 | $queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'"; |
| 1253 | 1253 | } |
| 1254 | - $queryi_values = array(':Registration' => $registration,':ident' => $icao); |
|
| 1254 | + $queryi_values = array(':Registration' => $registration, ':ident' => $icao); |
|
| 1255 | 1255 | } |
| 1256 | 1256 | try { |
| 1257 | 1257 | $sthi = $this->db->prepare($queryi); |
| 1258 | 1258 | $sthi->execute($queryi_values); |
| 1259 | - } catch(PDOException $e) { |
|
| 1259 | + } catch (PDOException $e) { |
|
| 1260 | 1260 | if ($globalDebug) echo $e->getMessage(); |
| 1261 | 1261 | return "error : ".$e->getMessage(); |
| 1262 | 1262 | } |
@@ -14,22 +14,22 @@ discard block |
||
| 14 | 14 | * @param Array $filter the filter |
| 15 | 15 | * @return Array the SQL part |
| 16 | 16 | */ |
| 17 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 20 | 20 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 21 | - foreach($globalStatsFilters[$globalFilterName] as $source) { |
|
| 21 | + foreach ($globalStatsFilters[$globalFilterName] as $source) { |
|
| 22 | 22 | if (isset($source['source'])) $filter['source'][] = $source['source']; |
| 23 | 23 | } |
| 24 | 24 | } else { |
| 25 | 25 | $filter = $globalStatsFilters[$globalFilterName]; |
| 26 | 26 | } |
| 27 | 27 | } |
| 28 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 28 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 29 | 29 | $filter_query_join = ''; |
| 30 | 30 | $filter_query_where = ''; |
| 31 | 31 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 32 | - $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 32 | + $filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 33 | 33 | } |
| 34 | 34 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 35 | 35 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | try { |
| 45 | 45 | $sth = $this->db->prepare($query); |
| 46 | 46 | $sth->execute($query_values); |
| 47 | - } catch(PDOException $e) { |
|
| 47 | + } catch (PDOException $e) { |
|
| 48 | 48 | return "error : ".$e->getMessage(); |
| 49 | 49 | } |
| 50 | 50 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -52,66 +52,66 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | public function getById($id) { |
| 55 | - $filter_query = $this->getFilter(array(),true); |
|
| 55 | + $filter_query = $this->getFilter(array(), true); |
|
| 56 | 56 | $query = "SELECT * FROM atc".$filter_query." atc_id = :id"; |
| 57 | 57 | $query_values = array(':id' => $id); |
| 58 | 58 | try { |
| 59 | 59 | $sth = $this->db->prepare($query); |
| 60 | 60 | $sth->execute($query_values); |
| 61 | - } catch(PDOException $e) { |
|
| 61 | + } catch (PDOException $e) { |
|
| 62 | 62 | return "error : ".$e->getMessage(); |
| 63 | 63 | } |
| 64 | 64 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 65 | 65 | return $all; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - public function getByIdent($ident,$format_source = '') { |
|
| 69 | - $filter_query = $this->getFilter(array(),true); |
|
| 68 | + public function getByIdent($ident, $format_source = '') { |
|
| 69 | + $filter_query = $this->getFilter(array(), true); |
|
| 70 | 70 | if ($format_source == '') { |
| 71 | 71 | $query = "SELECT * FROM atc".$filter_query." ident = :ident"; |
| 72 | 72 | $query_values = array(':ident' => $ident); |
| 73 | 73 | } else { |
| 74 | 74 | $query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source"; |
| 75 | - $query_values = array(':ident' => $ident,':format_source' => $format_source); |
|
| 75 | + $query_values = array(':ident' => $ident, ':format_source' => $format_source); |
|
| 76 | 76 | } |
| 77 | 77 | try { |
| 78 | 78 | $sth = $this->db->prepare($query); |
| 79 | 79 | $sth->execute($query_values); |
| 80 | - } catch(PDOException $e) { |
|
| 80 | + } catch (PDOException $e) { |
|
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
| 83 | 83 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 84 | 84 | return $all; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 88 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 89 | - $info = str_replace('^','<br />',$info); |
|
| 90 | - $info = str_replace('&sect;','',$info); |
|
| 91 | - $info = str_replace('"','',$info); |
|
| 87 | + public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 88 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 89 | + $info = str_replace('^', '<br />', $info); |
|
| 90 | + $info = str_replace('&sect;', '', $info); |
|
| 91 | + $info = str_replace('"', '', $info); |
|
| 92 | 92 | if ($type == '') $type = NULL; |
| 93 | 93 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 94 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 94 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 95 | 95 | try { |
| 96 | 96 | $sth = $this->db->prepare($query); |
| 97 | 97 | $sth->execute($query_values); |
| 98 | - } catch(PDOException $e) { |
|
| 98 | + } catch (PDOException $e) { |
|
| 99 | 99 | return "error : ".$e->getMessage(); |
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 104 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 105 | - $info = str_replace('^','<br />',$info); |
|
| 106 | - $info = str_replace('&sect;','',$info); |
|
| 107 | - $info = str_replace('"','',$info); |
|
| 103 | + public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 104 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 105 | + $info = str_replace('^', '<br />', $info); |
|
| 106 | + $info = str_replace('&sect;', '', $info); |
|
| 107 | + $info = str_replace('"', '', $info); |
|
| 108 | 108 | if ($type == '') $type = NULL; |
| 109 | 109 | $query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name"; |
| 110 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 110 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 111 | 111 | try { |
| 112 | 112 | $sth = $this->db->prepare($query); |
| 113 | 113 | $sth->execute($query_values); |
| 114 | - } catch(PDOException $e) { |
|
| 114 | + } catch (PDOException $e) { |
|
| 115 | 115 | return "error : ".$e->getMessage(); |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -122,18 +122,18 @@ discard block |
||
| 122 | 122 | try { |
| 123 | 123 | $sth = $this->db->prepare($query); |
| 124 | 124 | $sth->execute($query_values); |
| 125 | - } catch(PDOException $e) { |
|
| 125 | + } catch (PDOException $e) { |
|
| 126 | 126 | return "error : ".$e->getMessage(); |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - public function deleteByIdent($ident,$format_source) { |
|
| 130 | + public function deleteByIdent($ident, $format_source) { |
|
| 131 | 131 | $query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source"; |
| 132 | - $query_values = array(':ident' => $ident,':format_source' => $format_source); |
|
| 132 | + $query_values = array(':ident' => $ident, ':format_source' => $format_source); |
|
| 133 | 133 | try { |
| 134 | 134 | $sth = $this->db->prepare($query); |
| 135 | 135 | $sth->execute($query_values); |
| 136 | - } catch(PDOException $e) { |
|
| 136 | + } catch (PDOException $e) { |
|
| 137 | 137 | return "error : ".$e->getMessage(); |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | try { |
| 145 | 145 | $sth = $this->db->prepare($query); |
| 146 | 146 | $sth->execute($query_values); |
| 147 | - } catch(PDOException $e) { |
|
| 147 | + } catch (PDOException $e) { |
|
| 148 | 148 | return "error : ".$e->getMessage(); |
| 149 | 149 | } |
| 150 | 150 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | try { |
| 160 | 160 | $sth = $this->db->prepare($query); |
| 161 | 161 | $sth->execute(); |
| 162 | - } catch(PDOException $e) { |
|
| 162 | + } catch (PDOException $e) { |
|
| 163 | 163 | return "error"; |
| 164 | 164 | } |
| 165 | 165 | return "success"; |
@@ -34,12 +34,12 @@ discard block |
||
| 34 | 34 | $currentdate = date('Y-m-d'); |
| 35 | 35 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 36 | 36 | if (!empty($sourcestat)) { |
| 37 | - foreach($sourcestat as $srcst) { |
|
| 37 | + foreach ($sourcestat as $srcst) { |
|
| 38 | 38 | $type = $srcst['stats_type']; |
| 39 | 39 | if ($type == 'polar' || $type == 'hist') { |
| 40 | 40 | $source = $srcst['source_name']; |
| 41 | 41 | $data = $srcst['source_data']; |
| 42 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 42 | + $this->stats[$currentdate][$source][$type] = json_decode($data, true); |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | } |
@@ -51,14 +51,14 @@ discard block |
||
| 51 | 51 | if (isset($globalGeoid) && $globalGeoid) { |
| 52 | 52 | try { |
| 53 | 53 | $GeoidClass = new GeoidHeight(); |
| 54 | - } catch(Exception $e) { |
|
| 54 | + } catch (Exception $e) { |
|
| 55 | 55 | if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php \n"; |
| 56 | 56 | $GeoidClass = FALSE; |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - public function get_Schedule($id,$ident) { |
|
| 61 | + public function get_Schedule($id, $ident) { |
|
| 62 | 62 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 63 | 63 | // Get schedule here, so it's done only one time |
| 64 | 64 | |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | $schedule = $Schedule->fetchSchedule($operator); |
| 84 | 84 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 85 | 85 | if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
| 86 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 87 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 86 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 87 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 88 | 88 | // Should also check if route schedule = route from DB |
| 89 | 89 | if ($schedule['DepartureAirportIATA'] != '') { |
| 90 | 90 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | } |
| 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']); |
|
| 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']); |
|
| 108 | 108 | } |
| 109 | 109 | } else $scheduleexist = true; |
| 110 | 110 | } else $scheduleexist = true; |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | if ($scheduleexist) { |
| 113 | 113 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 114 | 114 | $sch = $Schedule->getSchedule($operator); |
| 115 | - $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'])); |
|
| 115 | + $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'])); |
|
| 116 | 116 | } |
| 117 | 117 | $Spotter->db = null; |
| 118 | 118 | $Schedule->db = null; |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 140 | 140 | $Spotter = new Spotter($this->db); |
| 141 | 141 | $real_arrival = $this->arrival($key); |
| 142 | - if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']); |
|
| 142 | + if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']); |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | 145 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $airport_time = ''; |
| 154 | 154 | if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
| 155 | 155 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 156 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 156 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist); |
|
| 157 | 157 | if (isset($closestAirports[0])) { |
| 158 | 158 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 159 | 159 | $airport_icao = $closestAirports[0]['icao']; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | break; |
| 169 | 169 | } |
| 170 | 170 | } |
| 171 | - } 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))) { |
|
| 171 | + } 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))) { |
|
| 172 | 172 | $airport_icao = $closestAirports[0]['icao']; |
| 173 | 173 | $airport_time = $this->all_flights[$key]['datetime']; |
| 174 | 174 | } else { |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | } else { |
| 182 | 182 | if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
| 183 | 183 | } |
| 184 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 184 | + return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 193 | 193 | foreach ($this->all_flights as $key => $flight) { |
| 194 | 194 | if (isset($flight['lastupdate'])) { |
| 195 | - if ($flight['lastupdate'] < (time()-5900)) { |
|
| 195 | + if ($flight['lastupdate'] < (time() - 5900)) { |
|
| 196 | 196 | $this->delKey($key); |
| 197 | 197 | } |
| 198 | 198 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | $real_arrival = $this->arrival($key); |
| 209 | 209 | $Spotter = new Spotter($this->db); |
| 210 | 210 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 211 | - $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']); |
|
| 211 | + $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']); |
|
| 212 | 212 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 213 | 213 | } |
| 214 | 214 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | $send = false; |
| 242 | 242 | |
| 243 | 243 | // SBS format is CSV format |
| 244 | - if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 244 | + if (is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 245 | 245 | //print_r($line); |
| 246 | 246 | if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
| 247 | 247 | 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)) { |
@@ -277,25 +277,25 @@ discard block |
||
| 277 | 277 | if (!isset($this->all_flights[$id])) { |
| 278 | 278 | if ($globalDebug) echo 'New flight...'."\n"; |
| 279 | 279 | $this->all_flights[$id] = array(); |
| 280 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 281 | - $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' => '')); |
|
| 282 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 280 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 281 | + $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' => '')); |
|
| 282 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
| 283 | 283 | if (!isset($line['id'])) { |
| 284 | 284 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 285 | 285 | // 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'))); |
| 286 | 286 | // 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'))); |
| 287 | - 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'))); |
|
| 287 | + 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'))); |
|
| 288 | 288 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 289 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 289 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 290 | 290 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 291 | 291 | } |
| 292 | 292 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 293 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 293 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type'])); |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | //print_r($this->all_flights); |
| 297 | 297 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 298 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 298 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex']))); |
|
| 299 | 299 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 300 | 300 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 301 | 301 | //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
@@ -304,27 +304,27 @@ discard block |
||
| 304 | 304 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 305 | 305 | $Spotter = new Spotter($this->db); |
| 306 | 306 | if (isset($this->all_flights[$id]['source_type'])) { |
| 307 | - $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
|
| 307 | + $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']); |
|
| 308 | 308 | } else { |
| 309 | 309 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 310 | 310 | } |
| 311 | 311 | $Spotter->db = null; |
| 312 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 313 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 312 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 313 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 314 | 314 | } |
| 315 | 315 | } |
| 316 | 316 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 317 | 317 | if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
| 318 | 318 | } |
| 319 | 319 | if (isset($line['id']) && !isset($line['hex'])) { |
| 320 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 320 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => '')); |
|
| 321 | 321 | } |
| 322 | 322 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 323 | 323 | $icao = $line['aircraft_icao']; |
| 324 | 324 | $Spotter = new Spotter($this->db); |
| 325 | 325 | if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
| 326 | 326 | $Spotter->db = null; |
| 327 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
|
| 327 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao)); |
|
| 328 | 328 | } |
| 329 | 329 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) { |
| 330 | 330 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | $Spotter = new Spotter($this->db); |
| 333 | 333 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 334 | 334 | $Spotter->db = null; |
| 335 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 335 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
@@ -340,15 +340,15 @@ discard block |
||
| 340 | 340 | elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
| 341 | 341 | elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
| 342 | 342 | elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
| 343 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 343 | + if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 344 | 344 | } |
| 345 | 345 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 346 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 346 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA')); |
|
| 347 | 347 | } |
| 348 | 348 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 349 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 349 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 350 | 350 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 351 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
| 351 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
| 352 | 352 | } else { |
| 353 | 353 | 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"; |
| 354 | 354 | 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"; |
@@ -359,31 +359,31 @@ discard block |
||
| 359 | 359 | */ |
| 360 | 360 | return ''; |
| 361 | 361 | } |
| 362 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 362 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 363 | 363 | if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
| 364 | 364 | return ''; |
| 365 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 365 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 366 | 366 | if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
| 367 | 367 | return ''; |
| 368 | 368 | } elseif (!isset($line['datetime'])) { |
| 369 | 369 | date_default_timezone_set('UTC'); |
| 370 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 370 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 371 | 371 | } else { |
| 372 | 372 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 373 | 373 | return ''; |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 377 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 377 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
| 378 | 378 | } |
| 379 | 379 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 380 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 380 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
| 381 | 381 | } |
| 382 | 382 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 383 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 383 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id']))); |
|
| 384 | 384 | } |
| 385 | 385 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 386 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 386 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name']))); |
|
| 387 | 387 | } |
| 388 | 388 | |
| 389 | 389 | 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'])) { |
@@ -391,13 +391,13 @@ discard block |
||
| 391 | 391 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 392 | 392 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 393 | 393 | if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
| 394 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 395 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 396 | - 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'))); |
|
| 397 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 398 | - 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'])); |
|
| 394 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 395 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 396 | + 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'))); |
|
| 397 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 398 | + 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'])); |
|
| 399 | 399 | } else { |
| 400 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 400 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 401 | 401 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 402 | 402 | $timeelapsed = microtime(true); |
| 403 | 403 | $Spotter = new Spotter($this->db); |
@@ -407,13 +407,13 @@ discard block |
||
| 407 | 407 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 408 | 408 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 409 | 409 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 410 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 410 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource); |
|
| 411 | 411 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 412 | 412 | $Spotter->db = null; |
| 413 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 413 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 414 | 414 | } |
| 415 | 415 | } |
| 416 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 416 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 417 | 417 | |
| 418 | 418 | /* |
| 419 | 419 | if (!isset($line['id'])) { |
@@ -423,25 +423,25 @@ discard block |
||
| 423 | 423 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 424 | 424 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 425 | 425 | */ |
| 426 | - 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'])); |
|
| 426 | + 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'])); |
|
| 427 | 427 | |
| 428 | 428 | //$putinarchive = true; |
| 429 | 429 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
| 430 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 430 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 431 | 431 | } |
| 432 | 432 | if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
| 433 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 433 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 434 | 434 | } |
| 435 | 435 | if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
| 436 | - $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 | + $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' => '')); |
|
| 437 | 437 | } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
| 438 | 438 | $timeelapsed = microtime(true); |
| 439 | 439 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 440 | 440 | $Spotter = new Spotter($this->db); |
| 441 | 441 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 442 | 442 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 443 | - $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' => '')); |
|
| 444 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 443 | + $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' => '')); |
|
| 444 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 445 | 445 | } |
| 446 | 446 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 447 | 447 | $timeelapsed = microtime(true); |
@@ -455,35 +455,35 @@ discard block |
||
| 455 | 455 | $Translation->db = null; |
| 456 | 456 | } |
| 457 | 457 | $Spotter->db = null; |
| 458 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 458 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 459 | 459 | } |
| 460 | 460 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 461 | 461 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
| 462 | 462 | if ($route['fromairport_icao'] != $route['toairport_icao']) { |
| 463 | 463 | // $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'])); |
| 464 | - $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'])); |
|
| 464 | + $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'])); |
|
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | if (!isset($globalFork)) $globalFork = TRUE; |
| 468 | 468 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 469 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 469 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident'])); |
|
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) { |
| 475 | 475 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 476 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 477 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 476 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
| 477 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
| 478 | 478 | //$dataFound = true; |
| 479 | 479 | } 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'])) { |
| 480 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 480 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
| 481 | 481 | if ($distance > 1000 && $distance < 10000) { |
| 482 | 482 | // use datetime |
| 483 | 483 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 484 | 484 | $speed = $speed*3.6; |
| 485 | 485 | if ($speed < 1000) { |
| 486 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 486 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
| 487 | 487 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 488 | 488 | } else { |
| 489 | 489 | if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
@@ -498,9 +498,9 @@ discard block |
||
| 498 | 498 | if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
| 499 | 499 | return false; |
| 500 | 500 | } |
| 501 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 501 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
| 502 | 502 | else unset($timediff); |
| 503 | - if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']); |
|
| 503 | + if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time() - $this->all_flights[$id]['time_last_archive_coord']); |
|
| 504 | 504 | else unset($timediff_archive); |
| 505 | 505 | if ($this->tmd > 5 |
| 506 | 506 | || (isset($line['format_source']) |
@@ -524,14 +524,14 @@ discard block |
||
| 524 | 524 | || ($timediff > 30 |
| 525 | 525 | && isset($this->all_flights[$id]['latitude']) |
| 526 | 526 | && isset($this->all_flights[$id]['longitude']) |
| 527 | - && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')) |
|
| 527 | + && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')) |
|
| 528 | 528 | ) |
| 529 | 529 | ) { |
| 530 | 530 | |
| 531 | 531 | if ((isset($timediff) && !isset($timediff_archive)) || (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']))) { |
| 532 | 532 | if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate) |
| 533 | 533 | || (isset($line['format_source']) && $line['format_source'] == 'airwhere') |
| 534 | - || !$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'])) { |
|
| 534 | + || !$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'])) { |
|
| 535 | 535 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 536 | 536 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 537 | 537 | $this->all_flights[$id]['putinarchive'] = true; |
@@ -541,11 +541,11 @@ discard block |
||
| 541 | 541 | $timeelapsed = microtime(true); |
| 542 | 542 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 543 | 543 | $Spotter = new Spotter($this->db); |
| 544 | - $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 544 | + $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 545 | 545 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 546 | 546 | else $this->all_flights[$id]['over_country'] = ''; |
| 547 | 547 | $Spotter->db = null; |
| 548 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 548 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 549 | 549 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 550 | 550 | } |
| 551 | 551 | } |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 572 | 572 | } |
| 573 | 573 | //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)) { |
| 574 | - if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) { |
|
| 574 | + if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001)) { |
|
| 575 | 575 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 576 | 576 | $dataFound = true; |
| 577 | 577 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 578 | 578 | } |
| 579 | 579 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 580 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
| 580 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
| 581 | 581 | /* |
| 582 | 582 | if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
| 583 | 583 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -599,13 +599,13 @@ discard block |
||
| 599 | 599 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 600 | 600 | } |
| 601 | 601 | //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)) { |
| 602 | - if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) { |
|
| 602 | + if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001)) { |
|
| 603 | 603 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 604 | 604 | $dataFound = true; |
| 605 | 605 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 606 | 606 | } |
| 607 | 607 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 608 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
| 608 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
| 609 | 609 | /* |
| 610 | 610 | if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
| 611 | 611 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -623,46 +623,46 @@ discard block |
||
| 623 | 623 | } else if ($globalDebug && $timediff > 30) { |
| 624 | 624 | $this->tmd = $this->tmd + 1; |
| 625 | 625 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 626 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
| 627 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 626 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
| 627 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 628 | 628 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 629 | 629 | } |
| 630 | 630 | } |
| 631 | 631 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 632 | 632 | if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 633 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 633 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update'])); |
|
| 634 | 634 | } |
| 635 | 635 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 636 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 636 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
| 637 | 637 | //$dataFound = true; |
| 638 | 638 | } |
| 639 | 639 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 640 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 640 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
| 641 | 641 | } |
| 642 | 642 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 643 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 643 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
| 644 | 644 | } |
| 645 | 645 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 646 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 646 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
| 647 | 647 | //$dataFound = true; |
| 648 | 648 | } |
| 649 | 649 | if (isset($line['ground']) && $line['ground'] != '') { |
| 650 | 650 | if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
| 651 | 651 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 652 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 653 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 654 | - 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'))); |
|
| 655 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 656 | - 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'])); |
|
| 652 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 653 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 654 | + 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'))); |
|
| 655 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 656 | + 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'])); |
|
| 657 | 657 | } |
| 658 | 658 | if ($line['ground'] != 1) $line['ground'] = 0; |
| 659 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 659 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
| 660 | 660 | //$dataFound = true; |
| 661 | 661 | } |
| 662 | 662 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 663 | 663 | 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'])) { |
| 664 | 664 | if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
| 665 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 665 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 666 | 666 | $highlight = ''; |
| 667 | 667 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
| 668 | 668 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
@@ -671,66 +671,66 @@ discard block |
||
| 671 | 671 | $timeelapsed = microtime(true); |
| 672 | 672 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 673 | 673 | $Spotter = new Spotter($this->db); |
| 674 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 674 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
| 675 | 675 | $Spotter->db = null; |
| 676 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 676 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 677 | 677 | } |
| 678 | 678 | //$putinarchive = true; |
| 679 | 679 | //$highlight = ''; |
| 680 | 680 | } |
| 681 | 681 | |
| 682 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 682 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 683 | 683 | //$dataFound = true; |
| 684 | 684 | } |
| 685 | 685 | |
| 686 | 686 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 687 | 687 | if (isset($line['altitude_relative']) && isset($GeoidClass) && is_object($GeoidClass)) { |
| 688 | 688 | if ($line['altitude_relative'] == 'AMSL' || $line['altitude_relative'] == 'MSL') { |
| 689 | - $geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'])*3.28084,2); |
|
| 689 | + $geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'])*3.28084, 2); |
|
| 690 | 690 | //if ($globalDebug) echo '=> Set altitude to WGS84 Ellipsoid, add '.$geoid.' to '.$line['altitude']."\n"; |
| 691 | 691 | $line['altitude'] = $line['altitude'] - $geoid; |
| 692 | 692 | } |
| 693 | 693 | } |
| 694 | 694 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 695 | - 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; |
|
| 696 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
| 697 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
| 695 | + 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; |
|
| 696 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
| 697 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
| 698 | 698 | //$dataFound = true; |
| 699 | 699 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 700 | 700 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
| 701 | 701 | 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) { |
| 702 | 702 | if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
| 703 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 704 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 705 | - 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'))); |
|
| 706 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 707 | - 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'])); |
|
| 703 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 704 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 705 | + 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'))); |
|
| 706 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 707 | + 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'])); |
|
| 708 | 708 | } |
| 709 | 709 | } |
| 710 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 710 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude'])); |
|
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 714 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 714 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
| 715 | 715 | } |
| 716 | 716 | |
| 717 | 717 | if (isset($line['heading']) && $line['heading'] != '') { |
| 718 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 719 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 720 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 718 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 719 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
| 720 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
| 721 | 721 | //$dataFound = true; |
| 722 | 722 | } 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']) { |
| 723 | - $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']); |
|
| 724 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 725 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 723 | + $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']); |
|
| 724 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
| 725 | + if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 726 | 726 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
| 727 | 727 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 728 | 728 | // If not enough messages and ACARS set heading to 0 |
| 729 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 729 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
| 730 | 730 | } |
| 731 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 732 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 733 | - elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 731 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 732 | + elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 733 | + elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 734 | 734 | |
| 735 | 735 | // print_r($this->all_flights[$id]); |
| 736 | 736 | //gets the callsign from the last hour |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | if ($dataFound === true && isset($this->all_flights[$id]['id'])) { |
| 742 | 742 | $this->all_flights[$id]['lastupdate'] = time(); |
| 743 | 743 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
| 744 | - 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'])) { |
|
| 744 | + 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'])) { |
|
| 745 | 745 | //print_r($this->all_flights); |
| 746 | 746 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 747 | 747 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
@@ -752,61 +752,61 @@ discard block |
||
| 752 | 752 | $SpotterLive = new SpotterLive($this->db); |
| 753 | 753 | 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')) { |
| 754 | 754 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 755 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 755 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 756 | 756 | } elseif (isset($line['id'])) { |
| 757 | 757 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 758 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 758 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 759 | 759 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 760 | 760 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 761 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 761 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 762 | 762 | } else $recent_ident = ''; |
| 763 | - $SpotterLive->db=null; |
|
| 763 | + $SpotterLive->db = null; |
|
| 764 | 764 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 765 | 765 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 766 | 766 | } else $recent_ident = ''; |
| 767 | 767 | } else { |
| 768 | 768 | $recent_ident = ''; |
| 769 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
| 769 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
| 770 | 770 | } |
| 771 | 771 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 772 | - if($recent_ident == "") |
|
| 772 | + if ($recent_ident == "") |
|
| 773 | 773 | { |
| 774 | 774 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 775 | 775 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 776 | 776 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 777 | 777 | //adds the spotter data for the archive |
| 778 | 778 | $ignoreImport = false; |
| 779 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 779 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 780 | 780 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 781 | 781 | $ignoreImport = true; |
| 782 | 782 | } |
| 783 | 783 | } |
| 784 | 784 | if (count($globalAirportAccept) > 0) { |
| 785 | 785 | $ignoreImport = true; |
| 786 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 786 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 787 | 787 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 788 | 788 | $ignoreImport = false; |
| 789 | 789 | } |
| 790 | 790 | } |
| 791 | 791 | } |
| 792 | 792 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 793 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 794 | - 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)) { |
|
| 793 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 794 | + 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)) { |
|
| 795 | 795 | $ignoreImport = true; |
| 796 | 796 | } |
| 797 | 797 | } |
| 798 | 798 | } |
| 799 | 799 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 800 | 800 | $ignoreImport = true; |
| 801 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 802 | - 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)) { |
|
| 801 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 802 | + 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)) { |
|
| 803 | 803 | $ignoreImport = false; |
| 804 | 804 | } |
| 805 | 805 | } |
| 806 | 806 | } |
| 807 | 807 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 808 | 808 | $ignoreImport = true; |
| 809 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 809 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 810 | 810 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 811 | 811 | $ignoreImport = false; |
| 812 | 812 | } |
@@ -818,32 +818,32 @@ discard block |
||
| 818 | 818 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
| 819 | 819 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
| 820 | 820 | if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
| 821 | - 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'))); |
|
| 821 | + 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'))); |
|
| 822 | 822 | $timeelapsed = microtime(true); |
| 823 | 823 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 824 | 824 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 825 | 825 | $Spotter = new Spotter($this->db); |
| 826 | - $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']); |
|
| 826 | + $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']); |
|
| 827 | 827 | $Spotter->db = null; |
| 828 | 828 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 829 | 829 | } |
| 830 | 830 | } |
| 831 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 831 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 832 | 832 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 833 | 833 | |
| 834 | 834 | // Add source stat in DB |
| 835 | 835 | $Stats = new Stats($this->db); |
| 836 | 836 | if (!empty($this->stats)) { |
| 837 | 837 | if ($globalDebug) echo 'Add source stats : '; |
| 838 | - foreach($this->stats as $date => $data) { |
|
| 839 | - foreach($data as $source => $sourced) { |
|
| 838 | + foreach ($this->stats as $date => $data) { |
|
| 839 | + foreach ($data as $source => $sourced) { |
|
| 840 | 840 | //print_r($sourced); |
| 841 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 842 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 841 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
| 842 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
| 843 | 843 | if (isset($sourced['msg'])) { |
| 844 | 844 | if (time() - $sourced['msg']['date'] > 10) { |
| 845 | 845 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 846 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 846 | + echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
| 847 | 847 | unset($this->stats[$date][$source]['msg']); |
| 848 | 848 | } |
| 849 | 849 | } |
@@ -881,14 +881,14 @@ discard block |
||
| 881 | 881 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 882 | 882 | $SpotterLive = new SpotterLive($this->db); |
| 883 | 883 | $SpotterLive->deleteLiveSpotterData(); |
| 884 | - $SpotterLive->db=null; |
|
| 884 | + $SpotterLive->db = null; |
|
| 885 | 885 | } |
| 886 | 886 | } |
| 887 | 887 | if ($globalDebug) echo " Done\n"; |
| 888 | 888 | $this->last_delete = time(); |
| 889 | 889 | } |
| 890 | 890 | } else { |
| 891 | - 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')) { |
|
| 891 | + 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')) { |
|
| 892 | 892 | $this->all_flights[$id]['id'] = $recent_ident; |
| 893 | 893 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 894 | 894 | } |
@@ -896,7 +896,7 @@ discard block |
||
| 896 | 896 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 897 | 897 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 898 | 898 | $Spotter = new Spotter($this->db); |
| 899 | - $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']); |
|
| 899 | + $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']); |
|
| 900 | 900 | $Spotter->db = null; |
| 901 | 901 | } |
| 902 | 902 | } |
@@ -922,37 +922,37 @@ discard block |
||
| 922 | 922 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 923 | 923 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 924 | 924 | |
| 925 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 925 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 926 | 926 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 927 | 927 | $ignoreImport = true; |
| 928 | 928 | } |
| 929 | 929 | } |
| 930 | 930 | if (count($globalAirportAccept) > 0) { |
| 931 | 931 | $ignoreImport = true; |
| 932 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 932 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 933 | 933 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 934 | 934 | $ignoreImport = false; |
| 935 | 935 | } |
| 936 | 936 | } |
| 937 | 937 | } |
| 938 | 938 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 939 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 940 | - 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)) { |
|
| 939 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 940 | + 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)) { |
|
| 941 | 941 | $ignoreImport = true; |
| 942 | 942 | } |
| 943 | 943 | } |
| 944 | 944 | } |
| 945 | 945 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 946 | 946 | $ignoreImport = true; |
| 947 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 948 | - 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)) { |
|
| 947 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 948 | + 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)) { |
|
| 949 | 949 | $ignoreImport = false; |
| 950 | 950 | } |
| 951 | 951 | } |
| 952 | 952 | } |
| 953 | 953 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 954 | 954 | $ignoreImport = true; |
| 955 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 955 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 956 | 956 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 957 | 957 | $ignoreImport = false; |
| 958 | 958 | } |
@@ -960,23 +960,23 @@ discard block |
||
| 960 | 960 | } |
| 961 | 961 | |
| 962 | 962 | if (!$ignoreImport) { |
| 963 | - 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'])) { |
|
| 964 | - 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'))); |
|
| 963 | + 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'])) { |
|
| 964 | + 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'))); |
|
| 965 | 965 | $timeelapsed = microtime(true); |
| 966 | 966 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 967 | 967 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 968 | 968 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 969 | 969 | $SpotterLive = new SpotterLive($this->db); |
| 970 | - $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']); |
|
| 970 | + $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']); |
|
| 971 | 971 | $SpotterLive->db = null; |
| 972 | 972 | if ($globalDebug) echo $result."\n"; |
| 973 | 973 | } |
| 974 | 974 | } |
| 975 | 975 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 976 | - $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']); |
|
| 976 | + $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']); |
|
| 977 | 977 | } |
| 978 | 978 | $this->all_flights[$id]['putinarchive'] = false; |
| 979 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 979 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 980 | 980 | |
| 981 | 981 | // Put statistics in $this->stats variable |
| 982 | 982 | //if ($line['format_source'] != 'aprs') { |
@@ -995,19 +995,19 @@ discard block |
||
| 995 | 995 | $latitude = $globalCenterLatitude; |
| 996 | 996 | $longitude = $globalCenterLongitude; |
| 997 | 997 | } |
| 998 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 998 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 999 | 999 | } else { |
| 1000 | 1000 | $latitude = $this->source_location[$source]['latitude']; |
| 1001 | 1001 | $longitude = $this->source_location[$source]['longitude']; |
| 1002 | 1002 | } |
| 1003 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 1003 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 1004 | 1004 | //$stats_heading = $stats_heading%22.5; |
| 1005 | 1005 | $stats_heading = round($stats_heading/22.5); |
| 1006 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 1006 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 1007 | 1007 | $current_date = date('Y-m-d'); |
| 1008 | 1008 | if ($stats_heading == 16) $stats_heading = 0; |
| 1009 | 1009 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 1010 | - for ($i=0;$i<=15;$i++) { |
|
| 1010 | + for ($i = 0; $i <= 15; $i++) { |
|
| 1011 | 1011 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 1012 | 1012 | } |
| 1013 | 1013 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -1022,9 +1022,9 @@ discard block |
||
| 1022 | 1022 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 1023 | 1023 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 1024 | 1024 | end($this->stats[$current_date][$source]['hist']); |
| 1025 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 1025 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 1026 | 1026 | } else $mini = 0; |
| 1027 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 1027 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 1028 | 1028 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 1029 | 1029 | } |
| 1030 | 1030 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -1037,7 +1037,7 @@ discard block |
||
| 1037 | 1037 | $this->all_flights[$id]['lastupdate'] = time(); |
| 1038 | 1038 | if ($this->all_flights[$id]['putinarchive']) $send = true; |
| 1039 | 1039 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 1040 | - } 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"; |
|
| 1040 | + } 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"; |
|
| 1041 | 1041 | //$this->del(); |
| 1042 | 1042 | |
| 1043 | 1043 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $Connection = new Connection(); |
| 55 | 55 | $sth = $Connection->db->prepare($query); |
| 56 | 56 | $sth->execute(); |
| 57 | - } catch(PDOException $e) { |
|
| 57 | + } catch (PDOException $e) { |
|
| 58 | 58 | return "error : ".$e->getMessage(); |
| 59 | 59 | } |
| 60 | 60 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $Connection = new Connection(); |
| 71 | 71 | $sth = $Connection->db->prepare($query); |
| 72 | 72 | $sth->execute(); |
| 73 | - } catch(PDOException $e) { |
|
| 73 | + } catch (PDOException $e) { |
|
| 74 | 74 | return "error : ".$e->getMessage(); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -78,9 +78,9 @@ discard block |
||
| 78 | 78 | public function parse($data) { |
| 79 | 79 | //$data = str_replace(array('\n','\r','\r','\n'),'',$data); |
| 80 | 80 | $codes = implode('|', array_keys($this->texts)); |
| 81 | - $regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#'; |
|
| 81 | + $regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#'; |
|
| 82 | 82 | //$pieces = explode(' ',$data); |
| 83 | - $pieces = preg_split('/\s/',$data); |
|
| 83 | + $pieces = preg_split('/\s/', $data); |
|
| 84 | 84 | $pos = 0; |
| 85 | 85 | if ($pieces[0] == 'METAR') $pos++; |
| 86 | 86 | elseif ($pieces[0] == 'SPECI') $pos++; |
@@ -88,25 +88,25 @@ discard block |
||
| 88 | 88 | $result = array(); |
| 89 | 89 | $result['location'] = $pieces[$pos]; |
| 90 | 90 | $pos++; |
| 91 | - $result['dayofmonth'] = substr($pieces[$pos],0,2); |
|
| 92 | - $result['time'] = substr($pieces[$pos],2,4); |
|
| 91 | + $result['dayofmonth'] = substr($pieces[$pos], 0, 2); |
|
| 92 | + $result['time'] = substr($pieces[$pos], 2, 4); |
|
| 93 | 93 | $c = count($pieces); |
| 94 | - for($pos++; $pos < $c; $pos++) { |
|
| 94 | + for ($pos++; $pos < $c; $pos++) { |
|
| 95 | 95 | $piece = $pieces[$pos]; |
| 96 | 96 | if ($piece == 'RMK') break; |
| 97 | 97 | if ($piece == 'AUTO') $result['auto'] = true; |
| 98 | 98 | if ($piece == 'COR') $result['correction'] = true; |
| 99 | 99 | // Wind Speed |
| 100 | 100 | if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) { |
| 101 | - $result['wind']['direction'] = (float)$matches[1]; |
|
| 101 | + $result['wind']['direction'] = (float) $matches[1]; |
|
| 102 | 102 | $result['wind']['unit'] = $matches[4]; |
| 103 | - if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2); |
|
| 104 | - elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2); |
|
| 105 | - elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2); |
|
| 106 | - $result['wind']['gust'] = (float)$matches[3]; |
|
| 103 | + if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2); |
|
| 104 | + elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2); |
|
| 105 | + elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2); |
|
| 106 | + $result['wind']['gust'] = (float) $matches[3]; |
|
| 107 | 107 | $result['wind']['unit'] = $matches[4]; |
| 108 | - $result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0; |
|
| 109 | - $result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0; |
|
| 108 | + $result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0; |
|
| 109 | + $result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0; |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /* if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) { |
@@ -127,14 +127,14 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | // Temperature |
| 129 | 129 | if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) { |
| 130 | - $temp = (float)$matches[1]; |
|
| 130 | + $temp = (float) $matches[1]; |
|
| 131 | 131 | if ($matches[1]{0} == 'M') { |
| 132 | - $temp = ((float)substr($matches[1], 1)) * -1; |
|
| 132 | + $temp = ((float) substr($matches[1], 1))*-1; |
|
| 133 | 133 | } |
| 134 | 134 | $result['temperature'] = $temp; |
| 135 | - $dew = (float)$matches[2]; |
|
| 135 | + $dew = (float) $matches[2]; |
|
| 136 | 136 | if ($matches[2]{0} == 'M') { |
| 137 | - $dew = ((float)substr($matches[2], 1)) * -1; |
|
| 137 | + $dew = ((float) substr($matches[2], 1))*-1; |
|
| 138 | 138 | } |
| 139 | 139 | $result['dew'] = $dew; |
| 140 | 140 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $result['QNH'] = $matches[2]; |
| 147 | 147 | } else { |
| 148 | 148 | // inHg |
| 149 | - $result['QNH'] = round(($matches[2] / 100)*33.86389,2); |
|
| 149 | + $result['QNH'] = round(($matches[2]/100)*33.86389, 2); |
|
| 150 | 150 | } |
| 151 | 151 | /* |
| 152 | 152 | $result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100); |
@@ -167,12 +167,12 @@ discard block |
||
| 167 | 167 | // Visibility |
| 168 | 168 | if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) { |
| 169 | 169 | if (isset($matches[3]) && strlen($matches[3]) > 0) { |
| 170 | - $result['visibility'] = (float)$matches[3] * 1609.34; |
|
| 170 | + $result['visibility'] = (float) $matches[3]*1609.34; |
|
| 171 | 171 | } else { |
| 172 | 172 | if ($matches[1] == '9999') { |
| 173 | 173 | $result['visibility'] = '> 10000'; |
| 174 | 174 | } else { |
| 175 | - $result['visibility'] = (float)$matches[1]; |
|
| 175 | + $result['visibility'] = (float) $matches[1]; |
|
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | if (preg_match('#^CAVOK$#', $piece, $matches)) { |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage'; |
| 195 | 195 | elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility'; |
| 196 | 196 | $cloud['type_code'] = $type; |
| 197 | - $cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048); |
|
| 197 | + $cloud['level'] = round(((float) $matches[2])*100*0.3048); |
|
| 198 | 198 | $cloud['significant'] = isset($matches[3]) ? $matches[3] : ''; |
| 199 | 199 | $result['cloud'][] = $cloud; |
| 200 | 200 | } |
@@ -204,8 +204,8 @@ discard block |
||
| 204 | 204 | $rvr['runway'] = $matches[1]; |
| 205 | 205 | $rvr['assessment'] = $matches[2]; |
| 206 | 206 | $rvr['rvr'] = $matches[3]; |
| 207 | - $rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0; |
|
| 208 | - $rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : ''; |
|
| 207 | + $rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0; |
|
| 208 | + $rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : ''; |
|
| 209 | 209 | $result['RVR'] = $rvr; |
| 210 | 210 | } |
| 211 | 211 | //if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
@@ -218,12 +218,12 @@ discard block |
||
| 218 | 218 | $result['RVR']['friction'] = $matches[5]; |
| 219 | 219 | } |
| 220 | 220 | if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
| 221 | - if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 222 | - else $range = array('exact' => (float)$matches[2], 'unit' => 'M'); |
|
| 221 | + if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 222 | + else $range = array('exact' => (float) $matches[2], 'unit' => 'M'); |
|
| 223 | 223 | if (isset($matches[3])) { |
| 224 | 224 | $range = Array( |
| 225 | - 'from' => (float)$matches[2], |
|
| 226 | - 'to' => (float)$matches[4], |
|
| 225 | + 'from' => (float) $matches[2], |
|
| 226 | + 'to' => (float) $matches[4], |
|
| 227 | 227 | 'unit' => $matches[5] ? 'FT' : 'M' |
| 228 | 228 | ); |
| 229 | 229 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | try { |
| 272 | 272 | $sth = $this->db->prepare($query); |
| 273 | 273 | $sth->execute($query_values); |
| 274 | - } catch(PDOException $e) { |
|
| 274 | + } catch (PDOException $e) { |
|
| 275 | 275 | return "error : ".$e->getMessage(); |
| 276 | 276 | } |
| 277 | 277 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -281,19 +281,19 @@ discard block |
||
| 281 | 281 | return $all; |
| 282 | 282 | } |
| 283 | 283 | |
| 284 | - public function addMETAR($location,$metar,$date) { |
|
| 284 | + public function addMETAR($location, $metar, $date) { |
|
| 285 | 285 | global $globalDBdriver; |
| 286 | - $date = date('Y-m-d H:i:s',strtotime($date)); |
|
| 286 | + $date = date('Y-m-d H:i:s', strtotime($date)); |
|
| 287 | 287 | if ($globalDBdriver == 'mysql') { |
| 288 | 288 | $query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar"; |
| 289 | 289 | } else { |
| 290 | 290 | $query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);"; |
| 291 | 291 | } |
| 292 | - $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar)); |
|
| 292 | + $query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar)); |
|
| 293 | 293 | try { |
| 294 | 294 | $sth = $this->db->prepare($query); |
| 295 | 295 | $sth->execute($query_values); |
| 296 | - } catch(PDOException $e) { |
|
| 296 | + } catch (PDOException $e) { |
|
| 297 | 297 | return "error : ".$e->getMessage(); |
| 298 | 298 | } |
| 299 | 299 | } |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | try { |
| 305 | 305 | $sth = $this->db->prepare($query); |
| 306 | 306 | $sth->execute($query_values); |
| 307 | - } catch(PDOException $e) { |
|
| 307 | + } catch (PDOException $e) { |
|
| 308 | 308 | return "error : ".$e->getMessage(); |
| 309 | 309 | } |
| 310 | 310 | } |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | try { |
| 315 | 315 | $sth = $this->db->prepare($query); |
| 316 | 316 | $sth->execute(); |
| 317 | - } catch(PDOException $e) { |
|
| 317 | + } catch (PDOException $e) { |
|
| 318 | 318 | return "error : ".$e->getMessage(); |
| 319 | 319 | } |
| 320 | 320 | } |
@@ -325,27 +325,27 @@ discard block |
||
| 325 | 325 | date_default_timezone_set("UTC"); |
| 326 | 326 | $Common = new Common(); |
| 327 | 327 | if (isset($globalIVAO) && $globalIVAO) { |
| 328 | - $Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt'); |
|
| 329 | - $handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r"); |
|
| 328 | + $Common->download('http://wx.ivao.aero/metar.php', dirname(__FILE__).'/../install/tmp/ivaometar.txt'); |
|
| 329 | + $handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt', "r"); |
|
| 330 | 330 | } else { |
| 331 | - $Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT'); |
|
| 332 | - $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r"); |
|
| 331 | + $Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT', dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT'); |
|
| 332 | + $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT', "r"); |
|
| 333 | 333 | } |
| 334 | 334 | if ($handle) { |
| 335 | 335 | if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB..."; |
| 336 | 336 | $date = ''; |
| 337 | 337 | if ($globalTransaction) $this->db->beginTransaction(); |
| 338 | - while(($line = fgets($handle,4096)) !== false) { |
|
| 339 | - if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
|
| 338 | + while (($line = fgets($handle, 4096)) !== false) { |
|
| 339 | + if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) { |
|
| 340 | 340 | $date = $line; |
| 341 | 341 | } elseif ($line != '') { |
| 342 | 342 | if ($date == '') $date = date('Y/m/d H:m'); |
| 343 | 343 | $pos = 0; |
| 344 | - $pieces = preg_split('/\s/',$line); |
|
| 344 | + $pieces = preg_split('/\s/', $line); |
|
| 345 | 345 | if ($pieces[0] == 'METAR') $pos++; |
| 346 | 346 | if (strlen($pieces[$pos]) != 4) $pos++; |
| 347 | 347 | $location = $pieces[$pos]; |
| 348 | - echo $this->addMETAR($location,$line,$date); |
|
| 348 | + echo $this->addMETAR($location, $line, $date); |
|
| 349 | 349 | } |
| 350 | 350 | } |
| 351 | 351 | fclose($handle); |
@@ -359,22 +359,22 @@ discard block |
||
| 359 | 359 | if ($globalMETARurl == '') return array(); |
| 360 | 360 | date_default_timezone_set("UTC"); |
| 361 | 361 | $Common = new Common(); |
| 362 | - $url = str_replace('{icao}',$icao,$globalMETARurl); |
|
| 362 | + $url = str_replace('{icao}', $icao, $globalMETARurl); |
|
| 363 | 363 | $cycle = $Common->getData($url); |
| 364 | 364 | $date = ''; |
| 365 | - foreach(explode("\n",$cycle) as $line) { |
|
| 366 | - if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
|
| 365 | + foreach (explode("\n", $cycle) as $line) { |
|
| 366 | + if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) { |
|
| 367 | 367 | $date = $line; |
| 368 | 368 | } |
| 369 | 369 | if ($line != '') { |
| 370 | 370 | if ($date == '') $date = date('Y/m/d H:m'); |
| 371 | 371 | $pos = 0; |
| 372 | - $pieces = preg_split('/\s/',$line); |
|
| 372 | + $pieces = preg_split('/\s/', $line); |
|
| 373 | 373 | if ($pieces[0] == 'METAR') $pos++; |
| 374 | 374 | if (strlen($pieces[$pos]) != 4) $pos++; |
| 375 | 375 | $location = $pieces[$pos]; |
| 376 | 376 | if (strlen($location == 4)) { |
| 377 | - $this->addMETAR($location,$line,$date); |
|
| 377 | + $this->addMETAR($location, $line, $date); |
|
| 378 | 378 | return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line)); |
| 379 | 379 | } else return array(); |
| 380 | 380 | } |
