Ysurac /
FlightAirMap
@@ -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 | |
@@ -1216,8 +1216,8 @@ discard block |
||
| 1216 | 1216 | $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)'; |
| 1217 | 1217 | try { |
| 1218 | 1218 | $sth = $Connection->db->prepare($query); |
| 1219 | - $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')); |
|
| 1220 | - } catch(PDOException $e) { |
|
| 1219 | + $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')); |
|
| 1220 | + } catch (PDOException $e) { |
|
| 1221 | 1221 | return "error : ".$e->getMessage(); |
| 1222 | 1222 | } |
| 1223 | 1223 | } |
@@ -1236,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | $Connection = new Connection(); |
| 1237 | 1237 | $sth = $Connection->db->prepare($query); |
| 1238 | 1238 | $sth->execute(); |
| 1239 | - } catch(PDOException $e) { |
|
| 1239 | + } catch (PDOException $e) { |
|
| 1240 | 1240 | return "error : ".$e->getMessage(); |
| 1241 | 1241 | } |
| 1242 | 1242 | |
@@ -1257,8 +1257,8 @@ discard block |
||
| 1257 | 1257 | $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)'; |
| 1258 | 1258 | try { |
| 1259 | 1259 | $sth = $Connection->db->prepare($query); |
| 1260 | - $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])); |
|
| 1261 | - } catch(PDOException $e) { |
|
| 1260 | + $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])); |
|
| 1261 | + } catch (PDOException $e) { |
|
| 1262 | 1262 | return "error : ".$e->getMessage(); |
| 1263 | 1263 | } |
| 1264 | 1264 | } |
@@ -1277,7 +1277,7 @@ discard block |
||
| 1277 | 1277 | $Connection = new Connection(); |
| 1278 | 1278 | $sth = $Connection->db->prepare($query); |
| 1279 | 1279 | $sth->execute(); |
| 1280 | - } catch(PDOException $e) { |
|
| 1280 | + } catch (PDOException $e) { |
|
| 1281 | 1281 | return "error : ".$e->getMessage(); |
| 1282 | 1282 | } |
| 1283 | 1283 | |
@@ -1293,7 +1293,7 @@ discard block |
||
| 1293 | 1293 | try { |
| 1294 | 1294 | $sth = $Connection->db->prepare($query); |
| 1295 | 1295 | $sth->execute(array(':icao' => $icao)); |
| 1296 | - } catch(PDOException $e) { |
|
| 1296 | + } catch (PDOException $e) { |
|
| 1297 | 1297 | return "error : ".$e->getMessage(); |
| 1298 | 1298 | } |
| 1299 | 1299 | } |
@@ -1304,7 +1304,7 @@ discard block |
||
| 1304 | 1304 | return ''; |
| 1305 | 1305 | } |
| 1306 | 1306 | |
| 1307 | - public static function tle($filename,$tletype) { |
|
| 1307 | + public static function tle($filename, $tletype) { |
|
| 1308 | 1308 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1309 | 1309 | global $tmp_dir, $globalTransaction; |
| 1310 | 1310 | //$Spotter = new Spotter(); |
@@ -1314,7 +1314,7 @@ discard block |
||
| 1314 | 1314 | $Connection = new Connection(); |
| 1315 | 1315 | $sth = $Connection->db->prepare($query); |
| 1316 | 1316 | $sth->execute(array(':source' => $filename)); |
| 1317 | - } catch(PDOException $e) { |
|
| 1317 | + } catch (PDOException $e) { |
|
| 1318 | 1318 | return "error : ".$e->getMessage(); |
| 1319 | 1319 | } |
| 1320 | 1320 | |
@@ -1339,8 +1339,8 @@ discard block |
||
| 1339 | 1339 | $query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)'; |
| 1340 | 1340 | try { |
| 1341 | 1341 | $sth = $Connection->db->prepare($query); |
| 1342 | - $sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename)); |
|
| 1343 | - } catch(PDOException $e) { |
|
| 1342 | + $sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename)); |
|
| 1343 | + } catch (PDOException $e) { |
|
| 1344 | 1344 | return "error : ".$e->getMessage(); |
| 1345 | 1345 | } |
| 1346 | 1346 | |
@@ -1360,28 +1360,28 @@ discard block |
||
| 1360 | 1360 | */ |
| 1361 | 1361 | private static function table2array($data) { |
| 1362 | 1362 | $html = str_get_html($data); |
| 1363 | - $tabledata=array(); |
|
| 1364 | - foreach($html->find('tr') as $element) |
|
| 1363 | + $tabledata = array(); |
|
| 1364 | + foreach ($html->find('tr') as $element) |
|
| 1365 | 1365 | { |
| 1366 | 1366 | $td = array(); |
| 1367 | - foreach( $element->find('th') as $row) |
|
| 1367 | + foreach ($element->find('th') as $row) |
|
| 1368 | 1368 | { |
| 1369 | 1369 | $td [] = trim($row->plaintext); |
| 1370 | 1370 | } |
| 1371 | - $td=array_filter($td); |
|
| 1371 | + $td = array_filter($td); |
|
| 1372 | 1372 | $tabledata[] = $td; |
| 1373 | 1373 | |
| 1374 | 1374 | $td = array(); |
| 1375 | 1375 | $tdi = array(); |
| 1376 | - foreach( $element->find('td') as $row) |
|
| 1376 | + foreach ($element->find('td') as $row) |
|
| 1377 | 1377 | { |
| 1378 | 1378 | $td [] = trim($row->plaintext); |
| 1379 | 1379 | $tdi [] = trim($row->innertext); |
| 1380 | 1380 | } |
| 1381 | - $td=array_filter($td); |
|
| 1382 | - $tdi=array_filter($tdi); |
|
| 1381 | + $td = array_filter($td); |
|
| 1382 | + $tdi = array_filter($tdi); |
|
| 1383 | 1383 | // $tabledata[]=array_merge($td,$tdi); |
| 1384 | - $tabledata[]=$td; |
|
| 1384 | + $tabledata[] = $td; |
|
| 1385 | 1385 | } |
| 1386 | 1386 | return(array_filter($tabledata)); |
| 1387 | 1387 | } |
@@ -1454,13 +1454,13 @@ discard block |
||
| 1454 | 1454 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1455 | 1455 | { |
| 1456 | 1456 | $i++; |
| 1457 | - if($i > 3 && count($row) > 2) { |
|
| 1457 | + if ($i > 3 && count($row) > 2) { |
|
| 1458 | 1458 | $data = array_values(array_filter($row)); |
| 1459 | 1459 | $cntdata = count($data); |
| 1460 | 1460 | if ($cntdata > 10) { |
| 1461 | 1461 | $value = $data[9]; |
| 1462 | 1462 | |
| 1463 | - for ($i =10;$i < $cntdata;$i++) { |
|
| 1463 | + for ($i = 10; $i < $cntdata; $i++) { |
|
| 1464 | 1464 | $value .= ' '.$data[$i]; |
| 1465 | 1465 | } |
| 1466 | 1466 | $data[9] = $value; |
@@ -1470,8 +1470,8 @@ discard block |
||
| 1470 | 1470 | $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)'; |
| 1471 | 1471 | try { |
| 1472 | 1472 | $sth = $Connection->db->prepare($query); |
| 1473 | - $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])); |
|
| 1474 | - } catch(PDOException $e) { |
|
| 1473 | + $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])); |
|
| 1474 | + } catch (PDOException $e) { |
|
| 1475 | 1475 | return "error : ".$e->getMessage(); |
| 1476 | 1476 | } |
| 1477 | 1477 | } |
@@ -1492,7 +1492,7 @@ discard block |
||
| 1492 | 1492 | $Connection = new Connection(); |
| 1493 | 1493 | $sth = $Connection->db->prepare($query); |
| 1494 | 1494 | $sth->execute(); |
| 1495 | - } catch(PDOException $e) { |
|
| 1495 | + } catch (PDOException $e) { |
|
| 1496 | 1496 | return "error : ".$e->getMessage(); |
| 1497 | 1497 | } |
| 1498 | 1498 | |
@@ -1504,12 +1504,12 @@ discard block |
||
| 1504 | 1504 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1505 | 1505 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1506 | 1506 | { |
| 1507 | - if(count($row) > 1) { |
|
| 1507 | + if (count($row) > 1) { |
|
| 1508 | 1508 | $query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')"; |
| 1509 | 1509 | try { |
| 1510 | 1510 | $sth = $Connection->db->prepare($query); |
| 1511 | - $sth->execute(array(':name' => $row[1],':icao' => $row[0])); |
|
| 1512 | - } catch(PDOException $e) { |
|
| 1511 | + $sth->execute(array(':name' => $row[1], ':icao' => $row[0])); |
|
| 1512 | + } catch (PDOException $e) { |
|
| 1513 | 1513 | return "error : ".$e->getMessage(); |
| 1514 | 1514 | } |
| 1515 | 1515 | } |
@@ -1529,21 +1529,21 @@ discard block |
||
| 1529 | 1529 | try { |
| 1530 | 1530 | $sth = $Connection->db->prepare($query); |
| 1531 | 1531 | $sth->execute(); |
| 1532 | - } catch(PDOException $e) { |
|
| 1532 | + } catch (PDOException $e) { |
|
| 1533 | 1533 | return "error : ".$e->getMessage(); |
| 1534 | 1534 | } |
| 1535 | 1535 | } |
| 1536 | 1536 | |
| 1537 | 1537 | |
| 1538 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1538 | + if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1539 | 1539 | else { |
| 1540 | - update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1540 | + update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1541 | 1541 | $query = "CREATE EXTENSION postgis"; |
| 1542 | - $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
|
| 1542 | + $Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']); |
|
| 1543 | 1543 | try { |
| 1544 | 1544 | $sth = $Connection->db->prepare($query); |
| 1545 | 1545 | $sth->execute(); |
| 1546 | - } catch(PDOException $e) { |
|
| 1546 | + } catch (PDOException $e) { |
|
| 1547 | 1547 | return "error : ".$e->getMessage(); |
| 1548 | 1548 | } |
| 1549 | 1549 | } |
@@ -1556,7 +1556,7 @@ discard block |
||
| 1556 | 1556 | include_once('class.create_db.php'); |
| 1557 | 1557 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1558 | 1558 | if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
| 1559 | - update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
|
| 1559 | + update_db::download('http://data.flightairmap.fr/data/notam.txt.gz', $tmp_dir.'notam.txt.gz'); |
|
| 1560 | 1560 | $error = ''; |
| 1561 | 1561 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1562 | 1562 | if ($globalDebug) echo "Gunzip..."; |
@@ -1588,14 +1588,14 @@ discard block |
||
| 1588 | 1588 | try { |
| 1589 | 1589 | $sth = $Connection->db->prepare($query); |
| 1590 | 1590 | $sth->execute(); |
| 1591 | - } catch(PDOException $e) { |
|
| 1591 | + } catch (PDOException $e) { |
|
| 1592 | 1592 | echo "error : ".$e->getMessage(); |
| 1593 | 1593 | } |
| 1594 | 1594 | } |
| 1595 | 1595 | if ($globalDBdriver == 'mysql') { |
| 1596 | - update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1596 | + update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1597 | 1597 | } else { |
| 1598 | - update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1598 | + update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1599 | 1599 | } |
| 1600 | 1600 | $error = create_db::import_file($tmp_dir.'countries.sql'); |
| 1601 | 1601 | return $error; |
@@ -1608,7 +1608,7 @@ discard block |
||
| 1608 | 1608 | // update_db::unzip($tmp_dir.'AptNav.zip'); |
| 1609 | 1609 | // update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz'); |
| 1610 | 1610 | // 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'); |
| 1611 | - 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'); |
|
| 1611 | + 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'); |
|
| 1612 | 1612 | update_db::gunzip($tmp_dir.'awy.dat.gz'); |
| 1613 | 1613 | $error = update_db::waypoints($tmp_dir.'awy.dat'); |
| 1614 | 1614 | return $error; |
@@ -1628,7 +1628,7 @@ discard block |
||
| 1628 | 1628 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 1629 | 1629 | if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
| 1630 | 1630 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 1631 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1631 | + if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1632 | 1632 | } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
| 1633 | 1633 | } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
| 1634 | 1634 | if ($error != '') { |
@@ -1641,7 +1641,7 @@ discard block |
||
| 1641 | 1641 | global $tmp_dir, $globalDebug; |
| 1642 | 1642 | $error = ''; |
| 1643 | 1643 | if ($globalDebug) echo "Routes : Download..."; |
| 1644 | - update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
|
| 1644 | + update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz'); |
|
| 1645 | 1645 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 1646 | 1646 | if ($globalDebug) echo "Gunzip..."; |
| 1647 | 1647 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
@@ -1657,7 +1657,7 @@ discard block |
||
| 1657 | 1657 | global $tmp_dir, $globalDebug; |
| 1658 | 1658 | $error = ''; |
| 1659 | 1659 | if ($globalDebug) echo "Schedules Oneworld : Download..."; |
| 1660 | - update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
|
| 1660 | + update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz'); |
|
| 1661 | 1661 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 1662 | 1662 | if ($globalDebug) echo "Gunzip..."; |
| 1663 | 1663 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
@@ -1673,7 +1673,7 @@ discard block |
||
| 1673 | 1673 | global $tmp_dir, $globalDebug; |
| 1674 | 1674 | $error = ''; |
| 1675 | 1675 | if ($globalDebug) echo "Schedules Skyteam : Download..."; |
| 1676 | - update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
|
| 1676 | + update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz'); |
|
| 1677 | 1677 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 1678 | 1678 | if ($globalDebug) echo "Gunzip..."; |
| 1679 | 1679 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
@@ -1701,7 +1701,7 @@ discard block |
||
| 1701 | 1701 | */ |
| 1702 | 1702 | if ($globalDebug) echo "Modes : Download..."; |
| 1703 | 1703 | // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
| 1704 | - update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
|
| 1704 | + update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz'); |
|
| 1705 | 1705 | |
| 1706 | 1706 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 1707 | 1707 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
@@ -1721,7 +1721,7 @@ discard block |
||
| 1721 | 1721 | public static function update_ModeS_faa() { |
| 1722 | 1722 | global $tmp_dir, $globalDebug; |
| 1723 | 1723 | if ($globalDebug) echo "Modes FAA: Download..."; |
| 1724 | - update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
|
| 1724 | + update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip'); |
|
| 1725 | 1725 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 1726 | 1726 | if ($globalDebug) echo "Unzip..."; |
| 1727 | 1727 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
@@ -1737,7 +1737,7 @@ discard block |
||
| 1737 | 1737 | public static function update_ModeS_flarm() { |
| 1738 | 1738 | global $tmp_dir, $globalDebug; |
| 1739 | 1739 | if ($globalDebug) echo "Modes Flarmnet: Download..."; |
| 1740 | - update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
|
| 1740 | + update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln'); |
|
| 1741 | 1741 | if (file_exists($tmp_dir.'data.fln')) { |
| 1742 | 1742 | if ($globalDebug) echo "Add to DB..."; |
| 1743 | 1743 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
@@ -1751,7 +1751,7 @@ discard block |
||
| 1751 | 1751 | public static function update_ModeS_ogn() { |
| 1752 | 1752 | global $tmp_dir, $globalDebug; |
| 1753 | 1753 | if ($globalDebug) echo "Modes OGN: Download..."; |
| 1754 | - update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
|
| 1754 | + update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv'); |
|
| 1755 | 1755 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 1756 | 1756 | if ($globalDebug) echo "Add to DB..."; |
| 1757 | 1757 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
@@ -1766,201 +1766,201 @@ discard block |
||
| 1766 | 1766 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 1767 | 1767 | |
| 1768 | 1768 | if ($globalDebug) echo "Owner France: Download..."; |
| 1769 | - update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
|
| 1769 | + update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv'); |
|
| 1770 | 1770 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 1771 | 1771 | if ($globalDebug) echo "Add to DB..."; |
| 1772 | - $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
|
| 1772 | + $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F'); |
|
| 1773 | 1773 | } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
| 1774 | 1774 | if ($error != '') { |
| 1775 | 1775 | return $error; |
| 1776 | 1776 | } elseif ($globalDebug) echo "Done\n"; |
| 1777 | 1777 | |
| 1778 | 1778 | if ($globalDebug) echo "Owner Ireland: Download..."; |
| 1779 | - update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
|
| 1779 | + update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv'); |
|
| 1780 | 1780 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 1781 | 1781 | if ($globalDebug) echo "Add to DB..."; |
| 1782 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
|
| 1782 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI'); |
|
| 1783 | 1783 | } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
| 1784 | 1784 | if ($error != '') { |
| 1785 | 1785 | return $error; |
| 1786 | 1786 | } elseif ($globalDebug) echo "Done\n"; |
| 1787 | 1787 | if ($globalDebug) echo "Owner Switzerland: Download..."; |
| 1788 | - update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
|
| 1788 | + update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv'); |
|
| 1789 | 1789 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 1790 | 1790 | if ($globalDebug) echo "Add to DB..."; |
| 1791 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
|
| 1791 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB'); |
|
| 1792 | 1792 | } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
| 1793 | 1793 | if ($error != '') { |
| 1794 | 1794 | return $error; |
| 1795 | 1795 | } elseif ($globalDebug) echo "Done\n"; |
| 1796 | 1796 | if ($globalDebug) echo "Owner Czech Republic: Download..."; |
| 1797 | - update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
|
| 1797 | + update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv'); |
|
| 1798 | 1798 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 1799 | 1799 | if ($globalDebug) echo "Add to DB..."; |
| 1800 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
|
| 1800 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK'); |
|
| 1801 | 1801 | } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
| 1802 | 1802 | if ($error != '') { |
| 1803 | 1803 | return $error; |
| 1804 | 1804 | } elseif ($globalDebug) echo "Done\n"; |
| 1805 | 1805 | if ($globalDebug) echo "Owner Australia: Download..."; |
| 1806 | - update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
|
| 1806 | + update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv'); |
|
| 1807 | 1807 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 1808 | 1808 | if ($globalDebug) echo "Add to DB..."; |
| 1809 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
|
| 1809 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH'); |
|
| 1810 | 1810 | } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
| 1811 | 1811 | if ($error != '') { |
| 1812 | 1812 | return $error; |
| 1813 | 1813 | } elseif ($globalDebug) echo "Done\n"; |
| 1814 | 1814 | if ($globalDebug) echo "Owner Austria: Download..."; |
| 1815 | - update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
|
| 1815 | + update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv'); |
|
| 1816 | 1816 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 1817 | 1817 | if ($globalDebug) echo "Add to DB..."; |
| 1818 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
|
| 1818 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE'); |
|
| 1819 | 1819 | } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
| 1820 | 1820 | if ($error != '') { |
| 1821 | 1821 | return $error; |
| 1822 | 1822 | } elseif ($globalDebug) echo "Done\n"; |
| 1823 | 1823 | if ($globalDebug) echo "Owner Chile: Download..."; |
| 1824 | - update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
|
| 1824 | + update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv'); |
|
| 1825 | 1825 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 1826 | 1826 | if ($globalDebug) echo "Add to DB..."; |
| 1827 | - $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
|
| 1827 | + $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC'); |
|
| 1828 | 1828 | } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
| 1829 | 1829 | if ($error != '') { |
| 1830 | 1830 | return $error; |
| 1831 | 1831 | } elseif ($globalDebug) echo "Done\n"; |
| 1832 | 1832 | if ($globalDebug) echo "Owner Colombia: Download..."; |
| 1833 | - update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
|
| 1833 | + update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv'); |
|
| 1834 | 1834 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 1835 | 1835 | if ($globalDebug) echo "Add to DB..."; |
| 1836 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
|
| 1836 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ'); |
|
| 1837 | 1837 | } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
| 1838 | 1838 | if ($error != '') { |
| 1839 | 1839 | return $error; |
| 1840 | 1840 | } elseif ($globalDebug) echo "Done\n"; |
| 1841 | 1841 | if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
| 1842 | - update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
|
| 1842 | + update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv'); |
|
| 1843 | 1843 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 1844 | 1844 | if ($globalDebug) echo "Add to DB..."; |
| 1845 | - $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
|
| 1845 | + $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7'); |
|
| 1846 | 1846 | } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
| 1847 | 1847 | if ($error != '') { |
| 1848 | 1848 | return $error; |
| 1849 | 1849 | } elseif ($globalDebug) echo "Done\n"; |
| 1850 | 1850 | if ($globalDebug) echo "Owner Brazil: Download..."; |
| 1851 | - update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
|
| 1851 | + update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv'); |
|
| 1852 | 1852 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 1853 | 1853 | if ($globalDebug) echo "Add to DB..."; |
| 1854 | - $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
|
| 1854 | + $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP'); |
|
| 1855 | 1855 | } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
| 1856 | 1856 | if ($error != '') { |
| 1857 | 1857 | return $error; |
| 1858 | 1858 | } elseif ($globalDebug) echo "Done\n"; |
| 1859 | 1859 | if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
| 1860 | - update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
|
| 1860 | + update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv'); |
|
| 1861 | 1861 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 1862 | 1862 | if ($globalDebug) echo "Add to DB..."; |
| 1863 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
|
| 1863 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP'); |
|
| 1864 | 1864 | } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
| 1865 | 1865 | if ($error != '') { |
| 1866 | 1866 | return $error; |
| 1867 | 1867 | } elseif ($globalDebug) echo "Done\n"; |
| 1868 | 1868 | if ($globalDebug) echo "Owner Croatia: Download..."; |
| 1869 | - update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
|
| 1869 | + update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv'); |
|
| 1870 | 1870 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 1871 | 1871 | if ($globalDebug) echo "Add to DB..."; |
| 1872 | - $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
|
| 1872 | + $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A'); |
|
| 1873 | 1873 | } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
| 1874 | 1874 | if ($error != '') { |
| 1875 | 1875 | return $error; |
| 1876 | 1876 | } elseif ($globalDebug) echo "Done\n"; |
| 1877 | 1877 | if ($globalDebug) echo "Owner Luxembourg: Download..."; |
| 1878 | - update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
|
| 1878 | + update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv'); |
|
| 1879 | 1879 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 1880 | 1880 | if ($globalDebug) echo "Add to DB..."; |
| 1881 | - $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
|
| 1881 | + $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX'); |
|
| 1882 | 1882 | } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
| 1883 | 1883 | if ($error != '') { |
| 1884 | 1884 | return $error; |
| 1885 | 1885 | } elseif ($globalDebug) echo "Done\n"; |
| 1886 | 1886 | if ($globalDebug) echo "Owner Maldives: Download..."; |
| 1887 | - update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
|
| 1887 | + update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv'); |
|
| 1888 | 1888 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 1889 | 1889 | if ($globalDebug) echo "Add to DB..."; |
| 1890 | - $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
|
| 1890 | + $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q'); |
|
| 1891 | 1891 | } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
| 1892 | 1892 | if ($error != '') { |
| 1893 | 1893 | return $error; |
| 1894 | 1894 | } elseif ($globalDebug) echo "Done\n"; |
| 1895 | 1895 | if ($globalDebug) echo "Owner New Zealand: Download..."; |
| 1896 | - update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
|
| 1896 | + update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv'); |
|
| 1897 | 1897 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 1898 | 1898 | if ($globalDebug) echo "Add to DB..."; |
| 1899 | - $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
|
| 1899 | + $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK'); |
|
| 1900 | 1900 | } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
| 1901 | 1901 | if ($error != '') { |
| 1902 | 1902 | return $error; |
| 1903 | 1903 | } elseif ($globalDebug) echo "Done\n"; |
| 1904 | 1904 | if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
| 1905 | - update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
|
| 1905 | + update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv'); |
|
| 1906 | 1906 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 1907 | 1907 | if ($globalDebug) echo "Add to DB..."; |
| 1908 | - $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
|
| 1908 | + $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2'); |
|
| 1909 | 1909 | } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
| 1910 | 1910 | if ($error != '') { |
| 1911 | 1911 | return $error; |
| 1912 | 1912 | } elseif ($globalDebug) echo "Done\n"; |
| 1913 | 1913 | if ($globalDebug) echo "Owner Slovakia: Download..."; |
| 1914 | - update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
|
| 1914 | + update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv'); |
|
| 1915 | 1915 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 1916 | 1916 | if ($globalDebug) echo "Add to DB..."; |
| 1917 | - $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
|
| 1917 | + $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM'); |
|
| 1918 | 1918 | } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
| 1919 | 1919 | if ($error != '') { |
| 1920 | 1920 | return $error; |
| 1921 | 1921 | } elseif ($globalDebug) echo "Done\n"; |
| 1922 | 1922 | if ($globalDebug) echo "Owner Ecuador: Download..."; |
| 1923 | - update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
|
| 1923 | + update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv'); |
|
| 1924 | 1924 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 1925 | 1925 | if ($globalDebug) echo "Add to DB..."; |
| 1926 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
|
| 1926 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC'); |
|
| 1927 | 1927 | } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
| 1928 | 1928 | if ($error != '') { |
| 1929 | 1929 | return $error; |
| 1930 | 1930 | } elseif ($globalDebug) echo "Done\n"; |
| 1931 | 1931 | if ($globalDebug) echo "Owner Iceland: Download..."; |
| 1932 | - update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
|
| 1932 | + update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv'); |
|
| 1933 | 1933 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 1934 | 1934 | if ($globalDebug) echo "Add to DB..."; |
| 1935 | - $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
|
| 1935 | + $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF'); |
|
| 1936 | 1936 | } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
| 1937 | 1937 | if ($error != '') { |
| 1938 | 1938 | return $error; |
| 1939 | 1939 | } elseif ($globalDebug) echo "Done\n"; |
| 1940 | 1940 | if ($globalDebug) echo "Owner Isle of Man: Download..."; |
| 1941 | - update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
|
| 1941 | + update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv'); |
|
| 1942 | 1942 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 1943 | 1943 | if ($globalDebug) echo "Add to DB..."; |
| 1944 | - $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
|
| 1944 | + $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M'); |
|
| 1945 | 1945 | } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
| 1946 | 1946 | if ($error != '') { |
| 1947 | 1947 | return $error; |
| 1948 | 1948 | } elseif ($globalDebug) echo "Done\n"; |
| 1949 | 1949 | if ($globalMasterSource) { |
| 1950 | 1950 | if ($globalDebug) echo "ModeS Netherlands: Download..."; |
| 1951 | - update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
|
| 1951 | + update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv'); |
|
| 1952 | 1952 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 1953 | 1953 | if ($globalDebug) echo "Add to DB..."; |
| 1954 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
|
| 1954 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH'); |
|
| 1955 | 1955 | } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
| 1956 | 1956 | if ($error != '') { |
| 1957 | 1957 | return $error; |
| 1958 | 1958 | } elseif ($globalDebug) echo "Done\n"; |
| 1959 | 1959 | if ($globalDebug) echo "ModeS Denmark: Download..."; |
| 1960 | - update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
|
| 1960 | + update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv'); |
|
| 1961 | 1961 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 1962 | 1962 | if ($globalDebug) echo "Add to DB..."; |
| 1963 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
|
| 1963 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY'); |
|
| 1964 | 1964 | } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
| 1965 | 1965 | if ($error != '') { |
| 1966 | 1966 | return $error; |
@@ -1973,7 +1973,7 @@ discard block |
||
| 1973 | 1973 | global $tmp_dir, $globalDebug; |
| 1974 | 1974 | $error = ''; |
| 1975 | 1975 | if ($globalDebug) echo "Translation : Download..."; |
| 1976 | - update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
|
| 1976 | + update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip'); |
|
| 1977 | 1977 | if (file_exists($tmp_dir.'translation.zip')) { |
| 1978 | 1978 | if ($globalDebug) echo "Unzip..."; |
| 1979 | 1979 | update_db::unzip($tmp_dir.'translation.zip'); |
@@ -1989,7 +1989,7 @@ discard block |
||
| 1989 | 1989 | public static function update_translation_fam() { |
| 1990 | 1990 | global $tmp_dir, $globalDebug; |
| 1991 | 1991 | if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
| 1992 | - update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
|
| 1992 | + update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz'); |
|
| 1993 | 1993 | if (file_exists($tmp_dir.'translation.tsv.gz')) { |
| 1994 | 1994 | if ($globalDebug) echo "Gunzip..."; |
| 1995 | 1995 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
@@ -2004,7 +2004,7 @@ discard block |
||
| 2004 | 2004 | public static function update_ModeS_fam() { |
| 2005 | 2005 | global $tmp_dir, $globalDebug; |
| 2006 | 2006 | if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
| 2007 | - update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
|
| 2007 | + update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz'); |
|
| 2008 | 2008 | if (file_exists($tmp_dir.'modes.tsv.gz')) { |
| 2009 | 2009 | if ($globalDebug) echo "Gunzip..."; |
| 2010 | 2010 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
@@ -2020,9 +2020,9 @@ discard block |
||
| 2020 | 2020 | global $tmp_dir, $globalDebug, $globalOwner; |
| 2021 | 2021 | if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
| 2022 | 2022 | if ($globalOwner === TRUE) { |
| 2023 | - update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2023 | + update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2024 | 2024 | } else { |
| 2025 | - update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2025 | + update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2026 | 2026 | } |
| 2027 | 2027 | if (file_exists($tmp_dir.'owners.tsv.gz')) { |
| 2028 | 2028 | if ($globalDebug) echo "Gunzip..."; |
@@ -2038,7 +2038,7 @@ discard block |
||
| 2038 | 2038 | public static function update_routes_fam() { |
| 2039 | 2039 | global $tmp_dir, $globalDebug; |
| 2040 | 2040 | if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
| 2041 | - update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
|
| 2041 | + update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz'); |
|
| 2042 | 2042 | if (file_exists($tmp_dir.'routes.tsv.gz')) { |
| 2043 | 2043 | if ($globalDebug) echo "Gunzip..."; |
| 2044 | 2044 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
@@ -2052,13 +2052,13 @@ discard block |
||
| 2052 | 2052 | } |
| 2053 | 2053 | public static function update_marine_identity_fam() { |
| 2054 | 2054 | global $tmp_dir, $globalDebug; |
| 2055 | - update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2055 | + update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2056 | 2056 | if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) { |
| 2057 | - $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2057 | + $marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2058 | 2058 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2059 | 2059 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2060 | 2060 | if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
| 2061 | - update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
|
| 2061 | + update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz'); |
|
| 2062 | 2062 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2063 | 2063 | if ($globalDebug) echo "Gunzip..."; |
| 2064 | 2064 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
@@ -2078,7 +2078,7 @@ discard block |
||
| 2078 | 2078 | public static function update_banned_fam() { |
| 2079 | 2079 | global $tmp_dir, $globalDebug; |
| 2080 | 2080 | if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
| 2081 | - update_db::download('http://data.flightairmap.fr/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
|
| 2081 | + update_db::download('http://data.flightairmap.fr/data/ban-eu.csv', $tmp_dir.'ban_eu.csv'); |
|
| 2082 | 2082 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2083 | 2083 | //if ($globalDebug) echo "Gunzip..."; |
| 2084 | 2084 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
@@ -2097,18 +2097,18 @@ discard block |
||
| 2097 | 2097 | $error = ''; |
| 2098 | 2098 | if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
| 2099 | 2099 | if ($globalDBdriver == 'mysql') { |
| 2100 | - update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2100 | + update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2101 | 2101 | } else { |
| 2102 | - update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2102 | + update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2103 | 2103 | } |
| 2104 | 2104 | if (file_exists($tmp_dir.'airspace.sql.gz.md5')) { |
| 2105 | - $airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2105 | + $airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2106 | 2106 | $airspace_md5 = $airspace_md5_file[0]; |
| 2107 | 2107 | if (!update_db::check_airspace_version($airspace_md5)) { |
| 2108 | 2108 | if ($globalDBdriver == 'mysql') { |
| 2109 | - update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2109 | + update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2110 | 2110 | } else { |
| 2111 | - update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2111 | + update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2112 | 2112 | } |
| 2113 | 2113 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2114 | 2114 | if ($globalDebug) echo "Gunzip..."; |
@@ -2120,7 +2120,7 @@ discard block |
||
| 2120 | 2120 | try { |
| 2121 | 2121 | $sth = $Connection->db->prepare($query); |
| 2122 | 2122 | $sth->execute(); |
| 2123 | - } catch(PDOException $e) { |
|
| 2123 | + } catch (PDOException $e) { |
|
| 2124 | 2124 | return "error : ".$e->getMessage(); |
| 2125 | 2125 | } |
| 2126 | 2126 | } |
@@ -2139,15 +2139,15 @@ discard block |
||
| 2139 | 2139 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
| 2140 | 2140 | $error = ''; |
| 2141 | 2141 | if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
| 2142 | - update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2142 | + update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5', $tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2143 | 2143 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
| 2144 | - $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2144 | + $geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2145 | 2145 | $geoid_md5 = $geoid_md5_file[0]; |
| 2146 | 2146 | if (!update_db::check_geoid_version($geoid_md5)) { |
| 2147 | - update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2147 | + update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz', $tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2148 | 2148 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
| 2149 | 2149 | if ($globalDebug) echo "Gunzip..."; |
| 2150 | - update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2150 | + update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz', dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2151 | 2151 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
| 2152 | 2152 | update_db::insert_geoid_version($geoid_md5); |
| 2153 | 2153 | } |
@@ -2163,15 +2163,15 @@ discard block |
||
| 2163 | 2163 | public static function update_tle() { |
| 2164 | 2164 | global $tmp_dir, $globalDebug; |
| 2165 | 2165 | if ($globalDebug) echo "Download TLE : Download..."; |
| 2166 | - $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', |
|
| 2167 | - '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', |
|
| 2168 | - 'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt'); |
|
| 2166 | + $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', |
|
| 2167 | + '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', |
|
| 2168 | + 'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt'); |
|
| 2169 | 2169 | foreach ($alltle as $filename) { |
| 2170 | 2170 | if ($globalDebug) echo "downloading ".$filename.'...'; |
| 2171 | - update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
|
| 2171 | + update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename); |
|
| 2172 | 2172 | if (file_exists($tmp_dir.$filename)) { |
| 2173 | 2173 | if ($globalDebug) echo "Add to DB ".$filename."..."; |
| 2174 | - $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
|
| 2174 | + $error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename)); |
|
| 2175 | 2175 | } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
| 2176 | 2176 | if ($error != '') { |
| 2177 | 2177 | echo $error."\n"; |
@@ -2184,32 +2184,32 @@ discard block |
||
| 2184 | 2184 | global $tmp_dir, $globalDebug; |
| 2185 | 2185 | $error = ''; |
| 2186 | 2186 | if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
| 2187 | - update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
|
| 2187 | + update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', $tmp_dir.'models.md5sum'); |
|
| 2188 | 2188 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2189 | 2189 | if ($globalDebug) echo "Check files...\n"; |
| 2190 | 2190 | $newmodelsdb = array(); |
| 2191 | - if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
|
| 2192 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2191 | + if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) { |
|
| 2192 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2193 | 2193 | $model = trim($row[2]); |
| 2194 | 2194 | $newmodelsdb[$model] = trim($row[0]); |
| 2195 | 2195 | } |
| 2196 | 2196 | } |
| 2197 | 2197 | $modelsdb = array(); |
| 2198 | 2198 | if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) { |
| 2199 | - if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) { |
|
| 2200 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2199 | + if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) { |
|
| 2200 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2201 | 2201 | $model = trim($row[2]); |
| 2202 | 2202 | $modelsdb[$model] = trim($row[0]); |
| 2203 | 2203 | } |
| 2204 | 2204 | } |
| 2205 | 2205 | } |
| 2206 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2206 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2207 | 2207 | foreach ($diff as $key => $value) { |
| 2208 | 2208 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
| 2209 | - update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
|
| 2209 | + update_db::download('http://data.flightairmap.fr/data/models/'.$key, dirname(__FILE__).'/../models/'.$key); |
|
| 2210 | 2210 | |
| 2211 | 2211 | } |
| 2212 | - update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2212 | + update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2213 | 2213 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2214 | 2214 | if ($error != '') { |
| 2215 | 2215 | return $error; |
@@ -2221,32 +2221,32 @@ discard block |
||
| 2221 | 2221 | global $tmp_dir, $globalDebug; |
| 2222 | 2222 | $error = ''; |
| 2223 | 2223 | if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
| 2224 | - update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
|
| 2224 | + update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum'); |
|
| 2225 | 2225 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2226 | 2226 | if ($globalDebug) echo "Check files...\n"; |
| 2227 | 2227 | $newmodelsdb = array(); |
| 2228 | - if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
|
| 2229 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2228 | + if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) { |
|
| 2229 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2230 | 2230 | $model = trim($row[2]); |
| 2231 | 2231 | $newmodelsdb[$model] = trim($row[0]); |
| 2232 | 2232 | } |
| 2233 | 2233 | } |
| 2234 | 2234 | $modelsdb = array(); |
| 2235 | 2235 | if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) { |
| 2236 | - if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) { |
|
| 2237 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2236 | + if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) { |
|
| 2237 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2238 | 2238 | $model = trim($row[2]); |
| 2239 | 2239 | $modelsdb[$model] = trim($row[0]); |
| 2240 | 2240 | } |
| 2241 | 2241 | } |
| 2242 | 2242 | } |
| 2243 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2243 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2244 | 2244 | foreach ($diff as $key => $value) { |
| 2245 | 2245 | if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
| 2246 | - update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
|
| 2246 | + update_db::download('http://data.flightairmap.fr/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key); |
|
| 2247 | 2247 | |
| 2248 | 2248 | } |
| 2249 | - update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2249 | + update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2250 | 2250 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2251 | 2251 | if ($error != '') { |
| 2252 | 2252 | return $error; |
@@ -2258,32 +2258,32 @@ discard block |
||
| 2258 | 2258 | global $tmp_dir, $globalDebug; |
| 2259 | 2259 | $error = ''; |
| 2260 | 2260 | if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
| 2261 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
|
| 2261 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum'); |
|
| 2262 | 2262 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2263 | 2263 | if ($globalDebug) echo "Check files...\n"; |
| 2264 | 2264 | $newmodelsdb = array(); |
| 2265 | - if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2266 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2265 | + if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2266 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2267 | 2267 | $model = trim($row[2]); |
| 2268 | 2268 | $newmodelsdb[$model] = trim($row[0]); |
| 2269 | 2269 | } |
| 2270 | 2270 | } |
| 2271 | 2271 | $modelsdb = array(); |
| 2272 | 2272 | if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) { |
| 2273 | - if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2274 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2273 | + if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2274 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2275 | 2275 | $model = trim($row[2]); |
| 2276 | 2276 | $modelsdb[$model] = trim($row[0]); |
| 2277 | 2277 | } |
| 2278 | 2278 | } |
| 2279 | 2279 | } |
| 2280 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2280 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2281 | 2281 | foreach ($diff as $key => $value) { |
| 2282 | 2282 | if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
| 2283 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2283 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2284 | 2284 | |
| 2285 | 2285 | } |
| 2286 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2286 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2287 | 2287 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2288 | 2288 | if ($error != '') { |
| 2289 | 2289 | return $error; |
@@ -2306,8 +2306,8 @@ discard block |
||
| 2306 | 2306 | */ |
| 2307 | 2307 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2308 | 2308 | //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
| 2309 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2310 | - $result = fread($fh,100000000); |
|
| 2309 | + $fh = fopen($tmp_dir.'aircrafts.html', "r"); |
|
| 2310 | + $result = fread($fh, 100000000); |
|
| 2311 | 2311 | //echo $result; |
| 2312 | 2312 | //var_dump(str_get_html($result)); |
| 2313 | 2313 | //print_r(self::table2array($result)); |
@@ -2325,23 +2325,23 @@ discard block |
||
| 2325 | 2325 | $Connection = new Connection(); |
| 2326 | 2326 | $sth = $Connection->db->prepare($query); |
| 2327 | 2327 | $sth->execute(); |
| 2328 | - } catch(PDOException $e) { |
|
| 2328 | + } catch (PDOException $e) { |
|
| 2329 | 2329 | return "error : ".$e->getMessage(); |
| 2330 | 2330 | } |
| 2331 | 2331 | |
| 2332 | 2332 | $error = ''; |
| 2333 | 2333 | if ($globalDebug) echo "Notam : Download..."; |
| 2334 | - update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
|
| 2334 | + update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss'); |
|
| 2335 | 2335 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2336 | - $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
|
| 2336 | + $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true); |
|
| 2337 | 2337 | foreach ($notams['channel']['item'] as $notam) { |
| 2338 | - $title = explode(':',$notam['title']); |
|
| 2338 | + $title = explode(':', $notam['title']); |
|
| 2339 | 2339 | $data['ref'] = trim($title[0]); |
| 2340 | 2340 | unset($title[0]); |
| 2341 | - $data['title'] = trim(implode(':',$title)); |
|
| 2342 | - $description = strip_tags($notam['description'],'<pre>'); |
|
| 2343 | - preg_match(':^(.*?)<pre>:',$description,$match); |
|
| 2344 | - $q = explode('/',$match[1]); |
|
| 2341 | + $data['title'] = trim(implode(':', $title)); |
|
| 2342 | + $description = strip_tags($notam['description'], '<pre>'); |
|
| 2343 | + preg_match(':^(.*?)<pre>:', $description, $match); |
|
| 2344 | + $q = explode('/', $match[1]); |
|
| 2345 | 2345 | $data['fir'] = $q[0]; |
| 2346 | 2346 | $data['code'] = $q[1]; |
| 2347 | 2347 | $ifrvfr = $q[2]; |
@@ -2357,30 +2357,30 @@ discard block |
||
| 2357 | 2357 | $data['lower_limit'] = $q[5]; |
| 2358 | 2358 | $data['upper_limit'] = $q[6]; |
| 2359 | 2359 | $latlonrad = $q[7]; |
| 2360 | - sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
|
| 2361 | - $latitude = $Common->convertDec($las,'latitude'); |
|
| 2362 | - $longitude = $Common->convertDec($lns,'longitude'); |
|
| 2360 | + sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius); |
|
| 2361 | + $latitude = $Common->convertDec($las, 'latitude'); |
|
| 2362 | + $longitude = $Common->convertDec($lns, 'longitude'); |
|
| 2363 | 2363 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 2364 | 2364 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 2365 | 2365 | $data['center_latitude'] = $latitude; |
| 2366 | 2366 | $data['center_longitude'] = $longitude; |
| 2367 | 2367 | $data['radius'] = intval($radius); |
| 2368 | 2368 | |
| 2369 | - preg_match(':<pre>(.*?)</pre>:',$description,$match); |
|
| 2369 | + preg_match(':<pre>(.*?)</pre>:', $description, $match); |
|
| 2370 | 2370 | $data['text'] = $match[1]; |
| 2371 | - preg_match(':</pre>(.*?)$:',$description,$match); |
|
| 2371 | + preg_match(':</pre>(.*?)$:', $description, $match); |
|
| 2372 | 2372 | $fromto = $match[1]; |
| 2373 | - preg_match('#FROM:(.*?)TO:#',$fromto,$match); |
|
| 2373 | + preg_match('#FROM:(.*?)TO:#', $fromto, $match); |
|
| 2374 | 2374 | $fromall = trim($match[1]); |
| 2375 | - preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match); |
|
| 2375 | + preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match); |
|
| 2376 | 2376 | $from = trim($match[1]); |
| 2377 | - $data['date_begin'] = date("Y-m-d H:i:s",strtotime($from)); |
|
| 2378 | - preg_match('#TO:(.*?)$#',$fromto,$match); |
|
| 2377 | + $data['date_begin'] = date("Y-m-d H:i:s", strtotime($from)); |
|
| 2378 | + preg_match('#TO:(.*?)$#', $fromto, $match); |
|
| 2379 | 2379 | $toall = trim($match[1]); |
| 2380 | - if (!preg_match(':Permanent:',$toall)) { |
|
| 2381 | - preg_match('#^(.*?) \((.*?)\)#',$toall,$match); |
|
| 2380 | + if (!preg_match(':Permanent:', $toall)) { |
|
| 2381 | + preg_match('#^(.*?) \((.*?)\)#', $toall, $match); |
|
| 2382 | 2382 | $to = trim($match[1]); |
| 2383 | - $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
|
| 2383 | + $data['date_end'] = date("Y-m-d H:i:s", strtotime($to)); |
|
| 2384 | 2384 | $data['permanent'] = 0; |
| 2385 | 2385 | } else { |
| 2386 | 2386 | $data['date_end'] = NULL; |
@@ -2388,7 +2388,7 @@ discard block |
||
| 2388 | 2388 | } |
| 2389 | 2389 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2390 | 2390 | $NOTAM = new NOTAM(); |
| 2391 | - $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']); |
|
| 2391 | + $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']); |
|
| 2392 | 2392 | unset($data); |
| 2393 | 2393 | } |
| 2394 | 2394 | } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
@@ -2411,16 +2411,16 @@ discard block |
||
| 2411 | 2411 | $Connection = new Connection(); |
| 2412 | 2412 | $sth = $Connection->db->prepare($query); |
| 2413 | 2413 | $sth->execute(); |
| 2414 | - } catch(PDOException $e) { |
|
| 2414 | + } catch (PDOException $e) { |
|
| 2415 | 2415 | return "error : ".$e->getMessage(); |
| 2416 | 2416 | } |
| 2417 | 2417 | } |
| 2418 | 2418 | $Common = new Common(); |
| 2419 | 2419 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 2420 | - $airspace_json = json_decode($airspace_lst,true); |
|
| 2420 | + $airspace_json = json_decode($airspace_lst, true); |
|
| 2421 | 2421 | foreach ($airspace_json['records'] as $airspace) { |
| 2422 | 2422 | if ($globalDebug) echo $airspace['name']."...\n"; |
| 2423 | - update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
|
| 2423 | + update_db::download($airspace['uri'], $tmp_dir.$airspace['name']); |
|
| 2424 | 2424 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 2425 | 2425 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
| 2426 | 2426 | //system('recode l9..utf8 '.$tmp_dir.$airspace['name']); |
@@ -2442,7 +2442,7 @@ discard block |
||
| 2442 | 2442 | $Connection = new Connection(); |
| 2443 | 2443 | $sth = $Connection->db->prepare($query); |
| 2444 | 2444 | $sth->execute(array(':new' => $new, ':old' => $old)); |
| 2445 | - } catch(PDOException $e) { |
|
| 2445 | + } catch (PDOException $e) { |
|
| 2446 | 2446 | return "error : ".$e->getMessage(); |
| 2447 | 2447 | } |
| 2448 | 2448 | } |
@@ -2459,7 +2459,7 @@ discard block |
||
| 2459 | 2459 | $Connection = new Connection(); |
| 2460 | 2460 | $sth = $Connection->db->prepare($query); |
| 2461 | 2461 | $sth->execute(); |
| 2462 | - } catch(PDOException $e) { |
|
| 2462 | + } catch (PDOException $e) { |
|
| 2463 | 2463 | return "error : ".$e->getMessage(); |
| 2464 | 2464 | } |
| 2465 | 2465 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2474,7 +2474,7 @@ discard block |
||
| 2474 | 2474 | $Connection = new Connection(); |
| 2475 | 2475 | $sth = $Connection->db->prepare($query); |
| 2476 | 2476 | $sth->execute(); |
| 2477 | - } catch(PDOException $e) { |
|
| 2477 | + } catch (PDOException $e) { |
|
| 2478 | 2478 | return "error : ".$e->getMessage(); |
| 2479 | 2479 | } |
| 2480 | 2480 | } |
@@ -2485,7 +2485,7 @@ discard block |
||
| 2485 | 2485 | $Connection = new Connection(); |
| 2486 | 2486 | $sth = $Connection->db->prepare($query); |
| 2487 | 2487 | $sth->execute(array(':version' => $version)); |
| 2488 | - } catch(PDOException $e) { |
|
| 2488 | + } catch (PDOException $e) { |
|
| 2489 | 2489 | return "error : ".$e->getMessage(); |
| 2490 | 2490 | } |
| 2491 | 2491 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2499,7 +2499,7 @@ discard block |
||
| 2499 | 2499 | $Connection = new Connection(); |
| 2500 | 2500 | $sth = $Connection->db->prepare($query); |
| 2501 | 2501 | $sth->execute(array(':version' => $version)); |
| 2502 | - } catch(PDOException $e) { |
|
| 2502 | + } catch (PDOException $e) { |
|
| 2503 | 2503 | return "error : ".$e->getMessage(); |
| 2504 | 2504 | } |
| 2505 | 2505 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2513,7 +2513,7 @@ discard block |
||
| 2513 | 2513 | $Connection = new Connection(); |
| 2514 | 2514 | $sth = $Connection->db->prepare($query); |
| 2515 | 2515 | $sth->execute(array(':version' => $version)); |
| 2516 | - } catch(PDOException $e) { |
|
| 2516 | + } catch (PDOException $e) { |
|
| 2517 | 2517 | return "error : ".$e->getMessage(); |
| 2518 | 2518 | } |
| 2519 | 2519 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2529,7 +2529,7 @@ discard block |
||
| 2529 | 2529 | $Connection = new Connection(); |
| 2530 | 2530 | $sth = $Connection->db->prepare($query); |
| 2531 | 2531 | $sth->execute(array(':version' => $version)); |
| 2532 | - } catch(PDOException $e) { |
|
| 2532 | + } catch (PDOException $e) { |
|
| 2533 | 2533 | return "error : ".$e->getMessage(); |
| 2534 | 2534 | } |
| 2535 | 2535 | } |
@@ -2541,7 +2541,7 @@ discard block |
||
| 2541 | 2541 | $Connection = new Connection(); |
| 2542 | 2542 | $sth = $Connection->db->prepare($query); |
| 2543 | 2543 | $sth->execute(array(':version' => $version)); |
| 2544 | - } catch(PDOException $e) { |
|
| 2544 | + } catch (PDOException $e) { |
|
| 2545 | 2545 | return "error : ".$e->getMessage(); |
| 2546 | 2546 | } |
| 2547 | 2547 | } |
@@ -2553,7 +2553,7 @@ discard block |
||
| 2553 | 2553 | $Connection = new Connection(); |
| 2554 | 2554 | $sth = $Connection->db->prepare($query); |
| 2555 | 2555 | $sth->execute(array(':version' => $version)); |
| 2556 | - } catch(PDOException $e) { |
|
| 2556 | + } catch (PDOException $e) { |
|
| 2557 | 2557 | return "error : ".$e->getMessage(); |
| 2558 | 2558 | } |
| 2559 | 2559 | } |
@@ -2569,7 +2569,7 @@ discard block |
||
| 2569 | 2569 | $Connection = new Connection(); |
| 2570 | 2570 | $sth = $Connection->db->prepare($query); |
| 2571 | 2571 | $sth->execute(); |
| 2572 | - } catch(PDOException $e) { |
|
| 2572 | + } catch (PDOException $e) { |
|
| 2573 | 2573 | return "error : ".$e->getMessage(); |
| 2574 | 2574 | } |
| 2575 | 2575 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2584,7 +2584,7 @@ discard block |
||
| 2584 | 2584 | $Connection = new Connection(); |
| 2585 | 2585 | $sth = $Connection->db->prepare($query); |
| 2586 | 2586 | $sth->execute(); |
| 2587 | - } catch(PDOException $e) { |
|
| 2587 | + } catch (PDOException $e) { |
|
| 2588 | 2588 | return "error : ".$e->getMessage(); |
| 2589 | 2589 | } |
| 2590 | 2590 | } |
@@ -2600,7 +2600,7 @@ discard block |
||
| 2600 | 2600 | $Connection = new Connection(); |
| 2601 | 2601 | $sth = $Connection->db->prepare($query); |
| 2602 | 2602 | $sth->execute(); |
| 2603 | - } catch(PDOException $e) { |
|
| 2603 | + } catch (PDOException $e) { |
|
| 2604 | 2604 | return "error : ".$e->getMessage(); |
| 2605 | 2605 | } |
| 2606 | 2606 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2615,7 +2615,7 @@ discard block |
||
| 2615 | 2615 | $Connection = new Connection(); |
| 2616 | 2616 | $sth = $Connection->db->prepare($query); |
| 2617 | 2617 | $sth->execute(); |
| 2618 | - } catch(PDOException $e) { |
|
| 2618 | + } catch (PDOException $e) { |
|
| 2619 | 2619 | return "error : ".$e->getMessage(); |
| 2620 | 2620 | } |
| 2621 | 2621 | } |
@@ -2631,7 +2631,7 @@ discard block |
||
| 2631 | 2631 | $Connection = new Connection(); |
| 2632 | 2632 | $sth = $Connection->db->prepare($query); |
| 2633 | 2633 | $sth->execute(); |
| 2634 | - } catch(PDOException $e) { |
|
| 2634 | + } catch (PDOException $e) { |
|
| 2635 | 2635 | return "error : ".$e->getMessage(); |
| 2636 | 2636 | } |
| 2637 | 2637 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2646,7 +2646,7 @@ discard block |
||
| 2646 | 2646 | $Connection = new Connection(); |
| 2647 | 2647 | $sth = $Connection->db->prepare($query); |
| 2648 | 2648 | $sth->execute(); |
| 2649 | - } catch(PDOException $e) { |
|
| 2649 | + } catch (PDOException $e) { |
|
| 2650 | 2650 | return "error : ".$e->getMessage(); |
| 2651 | 2651 | } |
| 2652 | 2652 | } |
@@ -2662,7 +2662,7 @@ discard block |
||
| 2662 | 2662 | $Connection = new Connection(); |
| 2663 | 2663 | $sth = $Connection->db->prepare($query); |
| 2664 | 2664 | $sth->execute(); |
| 2665 | - } catch(PDOException $e) { |
|
| 2665 | + } catch (PDOException $e) { |
|
| 2666 | 2666 | return "error : ".$e->getMessage(); |
| 2667 | 2667 | } |
| 2668 | 2668 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2677,7 +2677,7 @@ discard block |
||
| 2677 | 2677 | $Connection = new Connection(); |
| 2678 | 2678 | $sth = $Connection->db->prepare($query); |
| 2679 | 2679 | $sth->execute(); |
| 2680 | - } catch(PDOException $e) { |
|
| 2680 | + } catch (PDOException $e) { |
|
| 2681 | 2681 | return "error : ".$e->getMessage(); |
| 2682 | 2682 | } |
| 2683 | 2683 | } |
@@ -2692,7 +2692,7 @@ discard block |
||
| 2692 | 2692 | $Connection = new Connection(); |
| 2693 | 2693 | $sth = $Connection->db->prepare($query); |
| 2694 | 2694 | $sth->execute(); |
| 2695 | - } catch(PDOException $e) { |
|
| 2695 | + } catch (PDOException $e) { |
|
| 2696 | 2696 | return "error : ".$e->getMessage(); |
| 2697 | 2697 | } |
| 2698 | 2698 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2707,7 +2707,7 @@ discard block |
||
| 2707 | 2707 | $Connection = new Connection(); |
| 2708 | 2708 | $sth = $Connection->db->prepare($query); |
| 2709 | 2709 | $sth->execute(); |
| 2710 | - } catch(PDOException $e) { |
|
| 2710 | + } catch (PDOException $e) { |
|
| 2711 | 2711 | return "error : ".$e->getMessage(); |
| 2712 | 2712 | } |
| 2713 | 2713 | } |
@@ -2722,7 +2722,7 @@ discard block |
||
| 2722 | 2722 | $Connection = new Connection(); |
| 2723 | 2723 | $sth = $Connection->db->prepare($query); |
| 2724 | 2724 | $sth->execute(); |
| 2725 | - } catch(PDOException $e) { |
|
| 2725 | + } catch (PDOException $e) { |
|
| 2726 | 2726 | return "error : ".$e->getMessage(); |
| 2727 | 2727 | } |
| 2728 | 2728 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2737,7 +2737,7 @@ discard block |
||
| 2737 | 2737 | $Connection = new Connection(); |
| 2738 | 2738 | $sth = $Connection->db->prepare($query); |
| 2739 | 2739 | $sth->execute(); |
| 2740 | - } catch(PDOException $e) { |
|
| 2740 | + } catch (PDOException $e) { |
|
| 2741 | 2741 | return "error : ".$e->getMessage(); |
| 2742 | 2742 | } |
| 2743 | 2743 | } |
@@ -2752,7 +2752,7 @@ discard block |
||
| 2752 | 2752 | $Connection = new Connection(); |
| 2753 | 2753 | $sth = $Connection->db->prepare($query); |
| 2754 | 2754 | $sth->execute(); |
| 2755 | - } catch(PDOException $e) { |
|
| 2755 | + } catch (PDOException $e) { |
|
| 2756 | 2756 | return "error : ".$e->getMessage(); |
| 2757 | 2757 | } |
| 2758 | 2758 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2767,7 +2767,7 @@ discard block |
||
| 2767 | 2767 | $Connection = new Connection(); |
| 2768 | 2768 | $sth = $Connection->db->prepare($query); |
| 2769 | 2769 | $sth->execute(); |
| 2770 | - } catch(PDOException $e) { |
|
| 2770 | + } catch (PDOException $e) { |
|
| 2771 | 2771 | return "error : ".$e->getMessage(); |
| 2772 | 2772 | } |
| 2773 | 2773 | } |
@@ -2782,7 +2782,7 @@ discard block |
||
| 2782 | 2782 | $Connection = new Connection(); |
| 2783 | 2783 | $sth = $Connection->db->prepare($query); |
| 2784 | 2784 | $sth->execute(); |
| 2785 | - } catch(PDOException $e) { |
|
| 2785 | + } catch (PDOException $e) { |
|
| 2786 | 2786 | return "error : ".$e->getMessage(); |
| 2787 | 2787 | } |
| 2788 | 2788 | } |
@@ -2797,7 +2797,7 @@ discard block |
||
| 2797 | 2797 | $Connection = new Connection(); |
| 2798 | 2798 | $sth = $Connection->db->prepare($query); |
| 2799 | 2799 | $sth->execute(); |
| 2800 | - } catch(PDOException $e) { |
|
| 2800 | + } catch (PDOException $e) { |
|
| 2801 | 2801 | return "error : ".$e->getMessage(); |
| 2802 | 2802 | } |
| 2803 | 2803 | } |
@@ -17,7 +17,9 @@ discard block |
||
| 17 | 17 | curl_setopt($ch, CURLOPT_URL, $url); |
| 18 | 18 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
| 19 | 19 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
| 20 | - if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer); |
|
| 20 | + if ($referer != '') { |
|
| 21 | + curl_setopt($ch, CURLOPT_REFERER, $referer); |
|
| 22 | + } |
|
| 21 | 23 | curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5'); |
| 22 | 24 | curl_setopt($ch, CURLOPT_FILE, $fp); |
| 23 | 25 | curl_exec($ch); |
@@ -28,12 +30,16 @@ discard block |
||
| 28 | 30 | public static function gunzip($in_file,$out_file_name = '') { |
| 29 | 31 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 30 | 32 | $buffer_size = 4096; // read 4kb at a time |
| 31 | - if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
|
| 33 | + if ($out_file_name == '') { |
|
| 34 | + $out_file_name = str_replace('.gz', '', $in_file); |
|
| 35 | + } |
|
| 32 | 36 | if ($in_file != '' && file_exists($in_file)) { |
| 33 | 37 | // 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'); |
|
| 36 | - else { |
|
| 38 | + if (function_exists('gzopen')) { |
|
| 39 | + $file = gzopen($in_file,'rb'); |
|
| 40 | + } elseif (function_exists('gzopen64')) { |
|
| 41 | + $file = gzopen64($in_file,'rb'); |
|
| 42 | + } else { |
|
| 37 | 43 | echo 'gzopen not available'; |
| 38 | 44 | die; |
| 39 | 45 | } |
@@ -54,8 +60,12 @@ discard block |
||
| 54 | 60 | if ($res === TRUE) { |
| 55 | 61 | $zip->extractTo($path); |
| 56 | 62 | $zip->close(); |
| 57 | - } else return false; |
|
| 58 | - } else return false; |
|
| 63 | + } else { |
|
| 64 | + return false; |
|
| 65 | + } |
|
| 66 | + } else { |
|
| 67 | + return false; |
|
| 68 | + } |
|
| 59 | 69 | } |
| 60 | 70 | |
| 61 | 71 | public static function connect_sqlite($database) { |
@@ -70,7 +80,9 @@ discard block |
||
| 70 | 80 | public static function retrieve_route_sqlite_to_dest($database_file) { |
| 71 | 81 | global $globalDebug, $globalTransaction; |
| 72 | 82 | //$query = 'TRUNCATE TABLE routes'; |
| 73 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 83 | + if ($globalDebug) { |
|
| 84 | + echo " - Delete previous routes from DB -"; |
|
| 85 | + } |
|
| 74 | 86 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 75 | 87 | $Connection = new Connection(); |
| 76 | 88 | try { |
@@ -81,7 +93,9 @@ discard block |
||
| 81 | 93 | return "error : ".$e->getMessage(); |
| 82 | 94 | } |
| 83 | 95 | |
| 84 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 96 | + if ($globalDebug) { |
|
| 97 | + echo " - Add routes to DB -"; |
|
| 98 | + } |
|
| 85 | 99 | update_db::connect_sqlite($database_file); |
| 86 | 100 | //$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID'; |
| 87 | 101 | $query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID"; |
@@ -96,15 +110,21 @@ discard block |
||
| 96 | 110 | $Connection = new Connection(); |
| 97 | 111 | $sth_dest = $Connection->db->prepare($query_dest); |
| 98 | 112 | try { |
| 99 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 113 | + if ($globalTransaction) { |
|
| 114 | + $Connection->db->beginTransaction(); |
|
| 115 | + } |
|
| 100 | 116 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 101 | 117 | //$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 | 118 | $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 | 119 | $sth_dest->execute($query_dest_values); |
| 104 | 120 | } |
| 105 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 121 | + if ($globalTransaction) { |
|
| 122 | + $Connection->db->commit(); |
|
| 123 | + } |
|
| 106 | 124 | } catch(PDOException $e) { |
| 107 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 125 | + if ($globalTransaction) { |
|
| 126 | + $Connection->db->rollBack(); |
|
| 127 | + } |
|
| 108 | 128 | return "error : ".$e->getMessage(); |
| 109 | 129 | } |
| 110 | 130 | return ''; |
@@ -112,7 +132,9 @@ discard block |
||
| 112 | 132 | public static function retrieve_route_oneworld($database_file) { |
| 113 | 133 | global $globalDebug, $globalTransaction; |
| 114 | 134 | //$query = 'TRUNCATE TABLE routes'; |
| 115 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 135 | + if ($globalDebug) { |
|
| 136 | + echo " - Delete previous routes from DB -"; |
|
| 137 | + } |
|
| 116 | 138 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 117 | 139 | $Connection = new Connection(); |
| 118 | 140 | try { |
@@ -123,14 +145,18 @@ discard block |
||
| 123 | 145 | return "error : ".$e->getMessage(); |
| 124 | 146 | } |
| 125 | 147 | |
| 126 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 148 | + if ($globalDebug) { |
|
| 149 | + echo " - Add routes to DB -"; |
|
| 150 | + } |
|
| 127 | 151 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 128 | 152 | $Spotter = new Spotter(); |
| 129 | 153 | if ($fh = fopen($database_file,"r")) { |
| 130 | 154 | $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 | 155 | $Connection = new Connection(); |
| 132 | 156 | $sth_dest = $Connection->db->prepare($query_dest); |
| 133 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 157 | + if ($globalTransaction) { |
|
| 158 | + $Connection->db->beginTransaction(); |
|
| 159 | + } |
|
| 134 | 160 | while (!feof($fh)) { |
| 135 | 161 | $line = fgetcsv($fh,9999,','); |
| 136 | 162 | if ($line[0] != '') { |
@@ -139,13 +165,17 @@ discard block |
||
| 139 | 165 | $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 | 166 | $sth_dest->execute($query_dest_values); |
| 141 | 167 | } catch(PDOException $e) { |
| 142 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 168 | + if ($globalTransaction) { |
|
| 169 | + $Connection->db->rollBack(); |
|
| 170 | + } |
|
| 143 | 171 | return "error : ".$e->getMessage(); |
| 144 | 172 | } |
| 145 | 173 | } |
| 146 | 174 | } |
| 147 | 175 | } |
| 148 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 176 | + if ($globalTransaction) { |
|
| 177 | + $Connection->db->commit(); |
|
| 178 | + } |
|
| 149 | 179 | } |
| 150 | 180 | return ''; |
| 151 | 181 | } |
@@ -153,7 +183,9 @@ discard block |
||
| 153 | 183 | public static function retrieve_route_skyteam($database_file) { |
| 154 | 184 | global $globalDebug, $globalTransaction; |
| 155 | 185 | //$query = 'TRUNCATE TABLE routes'; |
| 156 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 186 | + if ($globalDebug) { |
|
| 187 | + echo " - Delete previous routes from DB -"; |
|
| 188 | + } |
|
| 157 | 189 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 158 | 190 | $Connection = new Connection(); |
| 159 | 191 | try { |
@@ -164,7 +196,9 @@ discard block |
||
| 164 | 196 | return "error : ".$e->getMessage(); |
| 165 | 197 | } |
| 166 | 198 | |
| 167 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 199 | + if ($globalDebug) { |
|
| 200 | + echo " - Add routes to DB -"; |
|
| 201 | + } |
|
| 168 | 202 | |
| 169 | 203 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 170 | 204 | $Spotter = new Spotter(); |
@@ -173,7 +207,9 @@ discard block |
||
| 173 | 207 | $Connection = new Connection(); |
| 174 | 208 | $sth_dest = $Connection->db->prepare($query_dest); |
| 175 | 209 | try { |
| 176 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 210 | + if ($globalTransaction) { |
|
| 211 | + $Connection->db->beginTransaction(); |
|
| 212 | + } |
|
| 177 | 213 | while (!feof($fh)) { |
| 178 | 214 | $line = fgetcsv($fh,9999,','); |
| 179 | 215 | if ($line[0] != '') { |
@@ -184,9 +220,13 @@ discard block |
||
| 184 | 220 | } |
| 185 | 221 | } |
| 186 | 222 | } |
| 187 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 223 | + if ($globalTransaction) { |
|
| 224 | + $Connection->db->commit(); |
|
| 225 | + } |
|
| 188 | 226 | } catch(PDOException $e) { |
| 189 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 227 | + if ($globalTransaction) { |
|
| 228 | + $Connection->db->rollBack(); |
|
| 229 | + } |
|
| 190 | 230 | return "error : ".$e->getMessage(); |
| 191 | 231 | } |
| 192 | 232 | } |
@@ -229,11 +269,16 @@ discard block |
||
| 229 | 269 | $sth_dest = $Connection->db->prepare($query_dest); |
| 230 | 270 | $sth_dest_owner = $Connection->db->prepare($query_dest_owner); |
| 231 | 271 | try { |
| 232 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 272 | + if ($globalTransaction) { |
|
| 273 | + $Connection->db->beginTransaction(); |
|
| 274 | + } |
|
| 233 | 275 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 234 | 276 | //$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 | - if ($values['UserString4'] == 'M') $type = 'military'; |
|
| 236 | - else $type = null; |
|
| 277 | + if ($values['UserString4'] == 'M') { |
|
| 278 | + $type = 'military'; |
|
| 279 | + } else { |
|
| 280 | + $type = null; |
|
| 281 | + } |
|
| 237 | 282 | $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 | 283 | $sth_dest->execute($query_dest_values); |
| 239 | 284 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
@@ -241,7 +286,9 @@ discard block |
||
| 241 | 286 | $sth_dest_owner->execute($query_dest_owner_values); |
| 242 | 287 | } |
| 243 | 288 | } |
| 244 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 289 | + if ($globalTransaction) { |
|
| 290 | + $Connection->db->commit(); |
|
| 291 | + } |
|
| 245 | 292 | } catch(PDOException $e) { |
| 246 | 293 | return "error : ".$e->getMessage(); |
| 247 | 294 | } |
@@ -278,7 +325,9 @@ discard block |
||
| 278 | 325 | $Connection = new Connection(); |
| 279 | 326 | $sth_dest = $Connection->db->prepare($query_dest); |
| 280 | 327 | try { |
| 281 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 328 | + if ($globalTransaction) { |
|
| 329 | + $Connection->db->beginTransaction(); |
|
| 330 | + } |
|
| 282 | 331 | while (!feof($fh)) { |
| 283 | 332 | $values = array(); |
| 284 | 333 | $line = $Common->hex2str(fgets($fh,9999)); |
@@ -289,7 +338,9 @@ discard block |
||
| 289 | 338 | // Check if we can find ICAO, else set it to GLID |
| 290 | 339 | $aircraft_name_split = explode(' ',$aircraft_name); |
| 291 | 340 | $search_more = ''; |
| 292 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 341 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) { |
|
| 342 | + $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 343 | + } |
|
| 293 | 344 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
| 294 | 345 | $sth_search = $Connection->db->prepare($query_search); |
| 295 | 346 | try { |
@@ -302,7 +353,9 @@ discard block |
||
| 302 | 353 | } catch(PDOException $e) { |
| 303 | 354 | return "error : ".$e->getMessage(); |
| 304 | 355 | } |
| 305 | - if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
|
| 356 | + if (!isset($values['ICAOTypeCode'])) { |
|
| 357 | + $values['ICAOTypeCode'] = 'GLID'; |
|
| 358 | + } |
|
| 306 | 359 | // Add data to db |
| 307 | 360 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
| 308 | 361 | //$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']); |
@@ -311,7 +364,9 @@ discard block |
||
| 311 | 364 | $sth_dest->execute($query_dest_values); |
| 312 | 365 | } |
| 313 | 366 | } |
| 314 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 367 | + if ($globalTransaction) { |
|
| 368 | + $Connection->db->commit(); |
|
| 369 | + } |
|
| 315 | 370 | } catch(PDOException $e) { |
| 316 | 371 | return "error : ".$e->getMessage(); |
| 317 | 372 | } |
@@ -347,7 +402,9 @@ discard block |
||
| 347 | 402 | $Connection = new Connection(); |
| 348 | 403 | $sth_dest = $Connection->db->prepare($query_dest); |
| 349 | 404 | try { |
| 350 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 405 | + if ($globalTransaction) { |
|
| 406 | + $Connection->db->beginTransaction(); |
|
| 407 | + } |
|
| 351 | 408 | $tmp = fgetcsv($fh,9999,',',"'"); |
| 352 | 409 | while (!feof($fh)) { |
| 353 | 410 | $line = fgetcsv($fh,9999,',',"'"); |
@@ -361,13 +418,17 @@ discard block |
||
| 361 | 418 | // Check if we can find ICAO, else set it to GLID |
| 362 | 419 | $aircraft_name_split = explode(' ',$aircraft_name); |
| 363 | 420 | $search_more = ''; |
| 364 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 421 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) { |
|
| 422 | + $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 423 | + } |
|
| 365 | 424 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
| 366 | 425 | $sth_search = $Connection->db->prepare($query_search); |
| 367 | 426 | try { |
| 368 | 427 | $sth_search->execute(); |
| 369 | 428 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
| 370 | - if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
| 429 | + if (isset($result['icao']) && $result['icao'] != '') { |
|
| 430 | + $values['ICAOTypeCode'] = $result['icao']; |
|
| 431 | + } |
|
| 371 | 432 | } catch(PDOException $e) { |
| 372 | 433 | return "error : ".$e->getMessage(); |
| 373 | 434 | } |
@@ -380,7 +441,9 @@ discard block |
||
| 380 | 441 | $sth_dest->execute($query_dest_values); |
| 381 | 442 | } |
| 382 | 443 | } |
| 383 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 444 | + if ($globalTransaction) { |
|
| 445 | + $Connection->db->commit(); |
|
| 446 | + } |
|
| 384 | 447 | } catch(PDOException $e) { |
| 385 | 448 | return "error : ".$e->getMessage(); |
| 386 | 449 | } |
@@ -419,7 +482,9 @@ discard block |
||
| 419 | 482 | $sth_dest = $Connection->db->prepare($query_dest); |
| 420 | 483 | $sth_modes = $Connection->db->prepare($query_modes); |
| 421 | 484 | try { |
| 422 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 485 | + if ($globalTransaction) { |
|
| 486 | + $Connection->db->beginTransaction(); |
|
| 487 | + } |
|
| 423 | 488 | $tmp = fgetcsv($fh,9999,',','"'); |
| 424 | 489 | while (!feof($fh)) { |
| 425 | 490 | $line = fgetcsv($fh,9999,',','"'); |
@@ -429,16 +494,22 @@ discard block |
||
| 429 | 494 | $values['registration'] = $line[0]; |
| 430 | 495 | $values['base'] = $line[4]; |
| 431 | 496 | $values['owner'] = $line[5]; |
| 432 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 433 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 497 | + if ($line[6] == '') { |
|
| 498 | + $values['date_first_reg'] = null; |
|
| 499 | + } else { |
|
| 500 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 501 | + } |
|
| 434 | 502 | $values['cancel'] = $line[7]; |
| 435 | 503 | } elseif ($country == 'EI') { |
| 436 | 504 | // TODO : add modeS & reg to aircraft_modes |
| 437 | 505 | $values['registration'] = $line[0]; |
| 438 | 506 | $values['base'] = $line[3]; |
| 439 | 507 | $values['owner'] = $line[2]; |
| 440 | - if ($line[1] == '') $values['date_first_reg'] = null; |
|
| 441 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 508 | + if ($line[1] == '') { |
|
| 509 | + $values['date_first_reg'] = null; |
|
| 510 | + } else { |
|
| 511 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 512 | + } |
|
| 442 | 513 | $values['cancel'] = ''; |
| 443 | 514 | $values['modes'] = $line[7]; |
| 444 | 515 | $values['icao'] = $line[8]; |
@@ -457,16 +528,22 @@ discard block |
||
| 457 | 528 | $values['registration'] = $line[3]; |
| 458 | 529 | $values['base'] = null; |
| 459 | 530 | $values['owner'] = $line[5]; |
| 460 | - if ($line[18] == '') $values['date_first_reg'] = null; |
|
| 461 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 531 | + if ($line[18] == '') { |
|
| 532 | + $values['date_first_reg'] = null; |
|
| 533 | + } else { |
|
| 534 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 535 | + } |
|
| 462 | 536 | $values['cancel'] = ''; |
| 463 | 537 | } elseif ($country == 'VH') { |
| 464 | 538 | // TODO : add modeS & reg to aircraft_modes |
| 465 | 539 | $values['registration'] = $line[0]; |
| 466 | 540 | $values['base'] = null; |
| 467 | 541 | $values['owner'] = $line[12]; |
| 468 | - if ($line[28] == '') $values['date_first_reg'] = null; |
|
| 469 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 542 | + if ($line[28] == '') { |
|
| 543 | + $values['date_first_reg'] = null; |
|
| 544 | + } else { |
|
| 545 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 546 | + } |
|
| 470 | 547 | |
| 471 | 548 | $values['cancel'] = $line[39]; |
| 472 | 549 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -485,29 +562,41 @@ discard block |
||
| 485 | 562 | $values['registration'] = $line[0]; |
| 486 | 563 | $values['base'] = null; |
| 487 | 564 | $values['owner'] = $line[8]; |
| 488 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 489 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 565 | + if ($line[7] == '') { |
|
| 566 | + $values['date_first_reg'] = null; |
|
| 567 | + } else { |
|
| 568 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 569 | + } |
|
| 490 | 570 | $values['cancel'] = ''; |
| 491 | 571 | } elseif ($country == 'PP') { |
| 492 | 572 | $values['registration'] = $line[0]; |
| 493 | 573 | $values['base'] = null; |
| 494 | 574 | $values['owner'] = $line[4]; |
| 495 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 496 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 575 | + if ($line[6] == '') { |
|
| 576 | + $values['date_first_reg'] = null; |
|
| 577 | + } else { |
|
| 578 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 579 | + } |
|
| 497 | 580 | $values['cancel'] = $line[7]; |
| 498 | 581 | } elseif ($country == 'E7') { |
| 499 | 582 | $values['registration'] = $line[0]; |
| 500 | 583 | $values['base'] = null; |
| 501 | 584 | $values['owner'] = $line[4]; |
| 502 | - if ($line[5] == '') $values['date_first_reg'] = null; |
|
| 503 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 585 | + if ($line[5] == '') { |
|
| 586 | + $values['date_first_reg'] = null; |
|
| 587 | + } else { |
|
| 588 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 589 | + } |
|
| 504 | 590 | $values['cancel'] = ''; |
| 505 | 591 | } elseif ($country == '8Q') { |
| 506 | 592 | $values['registration'] = $line[0]; |
| 507 | 593 | $values['base'] = null; |
| 508 | 594 | $values['owner'] = $line[3]; |
| 509 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 510 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 595 | + if ($line[7] == '') { |
|
| 596 | + $values['date_first_reg'] = null; |
|
| 597 | + } else { |
|
| 598 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 599 | + } |
|
| 511 | 600 | $values['cancel'] = ''; |
| 512 | 601 | } elseif ($country == 'ZK') { |
| 513 | 602 | $values['registration'] = $line[0]; |
@@ -552,7 +641,9 @@ discard block |
||
| 552 | 641 | $sth_modes->execute($query_modes_values); |
| 553 | 642 | } |
| 554 | 643 | } |
| 555 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 644 | + if ($globalTransaction) { |
|
| 645 | + $Connection->db->commit(); |
|
| 646 | + } |
|
| 556 | 647 | } catch(PDOException $e) { |
| 557 | 648 | return "error : ".$e->getMessage(); |
| 558 | 649 | } |
@@ -688,25 +779,45 @@ discard block |
||
| 688 | 779 | VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)"; |
| 689 | 780 | $Connection = new Connection(); |
| 690 | 781 | $sth_dest = $Connection->db->prepare($query_dest); |
| 691 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 782 | + if ($globalTransaction) { |
|
| 783 | + $Connection->db->beginTransaction(); |
|
| 784 | + } |
|
| 692 | 785 | |
| 693 | 786 | $i = 0; |
| 694 | 787 | while($row = sparql_fetch_array($result)) |
| 695 | 788 | { |
| 696 | 789 | if ($i >= 1) { |
| 697 | 790 | //print_r($row); |
| 698 | - if (!isset($row['iata'])) $row['iata'] = ''; |
|
| 699 | - if (!isset($row['icao'])) $row['icao'] = ''; |
|
| 700 | - if (!isset($row['type'])) $row['type'] = ''; |
|
| 701 | - if (!isset($row['altitude'])) $row['altitude'] = ''; |
|
| 791 | + if (!isset($row['iata'])) { |
|
| 792 | + $row['iata'] = ''; |
|
| 793 | + } |
|
| 794 | + if (!isset($row['icao'])) { |
|
| 795 | + $row['icao'] = ''; |
|
| 796 | + } |
|
| 797 | + if (!isset($row['type'])) { |
|
| 798 | + $row['type'] = ''; |
|
| 799 | + } |
|
| 800 | + if (!isset($row['altitude'])) { |
|
| 801 | + $row['altitude'] = ''; |
|
| 802 | + } |
|
| 702 | 803 | if (isset($row['city_bis'])) { |
| 703 | 804 | $row['city'] = $row['city_bis']; |
| 704 | 805 | } |
| 705 | - if (!isset($row['city'])) $row['city'] = ''; |
|
| 706 | - if (!isset($row['country'])) $row['country'] = ''; |
|
| 707 | - if (!isset($row['homepage'])) $row['homepage'] = ''; |
|
| 708 | - if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = ''; |
|
| 709 | - if (!isset($row['name'])) continue; |
|
| 806 | + if (!isset($row['city'])) { |
|
| 807 | + $row['city'] = ''; |
|
| 808 | + } |
|
| 809 | + if (!isset($row['country'])) { |
|
| 810 | + $row['country'] = ''; |
|
| 811 | + } |
|
| 812 | + if (!isset($row['homepage'])) { |
|
| 813 | + $row['homepage'] = ''; |
|
| 814 | + } |
|
| 815 | + if (!isset($row['wikipedia_page'])) { |
|
| 816 | + $row['wikipedia_page'] = ''; |
|
| 817 | + } |
|
| 818 | + if (!isset($row['name'])) { |
|
| 819 | + continue; |
|
| 820 | + } |
|
| 710 | 821 | if (!isset($row['image'])) { |
| 711 | 822 | $row['image'] = ''; |
| 712 | 823 | $row['image_thumb'] = ''; |
@@ -762,7 +873,9 @@ discard block |
||
| 762 | 873 | |
| 763 | 874 | $i++; |
| 764 | 875 | } |
| 765 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 876 | + if ($globalTransaction) { |
|
| 877 | + $Connection->db->commit(); |
|
| 878 | + } |
|
| 766 | 879 | /* |
| 767 | 880 | echo "Delete duplicate rows...\n"; |
| 768 | 881 | $query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)'; |
@@ -805,7 +918,9 @@ discard block |
||
| 805 | 918 | $delimiter = ','; |
| 806 | 919 | $out_file = $tmp_dir.'airports.csv'; |
| 807 | 920 | update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
| 808 | - if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
|
| 921 | + if (!file_exists($out_file) || !is_readable($out_file)) { |
|
| 922 | + return FALSE; |
|
| 923 | + } |
|
| 809 | 924 | echo "Add data from ourairports.com...\n"; |
| 810 | 925 | |
| 811 | 926 | $header = NULL; |
@@ -815,8 +930,9 @@ discard block |
||
| 815 | 930 | //$Connection->db->beginTransaction(); |
| 816 | 931 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 817 | 932 | { |
| 818 | - if(!$header) $header = $row; |
|
| 819 | - else { |
|
| 933 | + if(!$header) { |
|
| 934 | + $header = $row; |
|
| 935 | + } else { |
|
| 820 | 936 | $data = array(); |
| 821 | 937 | $data = array_combine($header, $row); |
| 822 | 938 | try { |
@@ -857,7 +973,9 @@ discard block |
||
| 857 | 973 | echo "Download data from another free database...\n"; |
| 858 | 974 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
| 859 | 975 | update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
| 860 | - if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
|
| 976 | + if (!file_exists($out_file) || !is_readable($out_file)) { |
|
| 977 | + return FALSE; |
|
| 978 | + } |
|
| 861 | 979 | update_db::unzip($out_file); |
| 862 | 980 | $header = NULL; |
| 863 | 981 | echo "Add data from another free database...\n"; |
@@ -868,8 +986,9 @@ discard block |
||
| 868 | 986 | //$Connection->db->beginTransaction(); |
| 869 | 987 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 870 | 988 | { |
| 871 | - if(!$header) $header = $row; |
|
| 872 | - else { |
|
| 989 | + if(!$header) { |
|
| 990 | + $header = $row; |
|
| 991 | + } else { |
|
| 873 | 992 | $data = $row; |
| 874 | 993 | |
| 875 | 994 | $query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao'; |
@@ -1042,7 +1161,9 @@ discard block |
||
| 1042 | 1161 | if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE) |
| 1043 | 1162 | { |
| 1044 | 1163 | $i = 0; |
| 1045 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1164 | + if ($globalTransaction) { |
|
| 1165 | + $Connection->db->beginTransaction(); |
|
| 1166 | + } |
|
| 1046 | 1167 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1047 | 1168 | { |
| 1048 | 1169 | if ($i > 0) { |
@@ -1055,7 +1176,9 @@ discard block |
||
| 1055 | 1176 | } |
| 1056 | 1177 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
| 1057 | 1178 | if (!empty($result_search)) { |
| 1058 | - if ($globalDebug) echo '.'; |
|
| 1179 | + if ($globalDebug) { |
|
| 1180 | + echo '.'; |
|
| 1181 | + } |
|
| 1059 | 1182 | //if ($globalDBdriver == 'mysql') { |
| 1060 | 1183 | // $queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao'; |
| 1061 | 1184 | //} else { |
@@ -1077,8 +1200,12 @@ discard block |
||
| 1077 | 1200 | } |
| 1078 | 1201 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
| 1079 | 1202 | if (!empty($result_search_mfr)) { |
| 1080 | - if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23]; |
|
| 1081 | - if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15]; |
|
| 1203 | + if (trim($data[16]) == '' && trim($data[23]) != '') { |
|
| 1204 | + $data[16] = $data[23]; |
|
| 1205 | + } |
|
| 1206 | + if (trim($data[16]) == '' && trim($data[15]) != '') { |
|
| 1207 | + $data[16] = $data[15]; |
|
| 1208 | + } |
|
| 1082 | 1209 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
| 1083 | 1210 | try { |
| 1084 | 1211 | $sthf = $Connection->db->prepare($queryf); |
@@ -1089,7 +1216,9 @@ discard block |
||
| 1089 | 1216 | } |
| 1090 | 1217 | } |
| 1091 | 1218 | if (strtotime($data[29]) > time()) { |
| 1092 | - if ($globalDebug) echo 'i'; |
|
| 1219 | + if ($globalDebug) { |
|
| 1220 | + echo 'i'; |
|
| 1221 | + } |
|
| 1093 | 1222 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 1094 | 1223 | try { |
| 1095 | 1224 | $sth = $Connection->db->prepare($query); |
@@ -1100,13 +1229,19 @@ discard block |
||
| 1100 | 1229 | } |
| 1101 | 1230 | } |
| 1102 | 1231 | if ($i % 90 == 0) { |
| 1103 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1104 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1232 | + if ($globalTransaction) { |
|
| 1233 | + $Connection->db->commit(); |
|
| 1234 | + } |
|
| 1235 | + if ($globalTransaction) { |
|
| 1236 | + $Connection->db->beginTransaction(); |
|
| 1237 | + } |
|
| 1105 | 1238 | } |
| 1106 | 1239 | $i++; |
| 1107 | 1240 | } |
| 1108 | 1241 | fclose($handle); |
| 1109 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1242 | + if ($globalTransaction) { |
|
| 1243 | + $Connection->db->commit(); |
|
| 1244 | + } |
|
| 1110 | 1245 | } |
| 1111 | 1246 | print_r($mfr); |
| 1112 | 1247 | return ''; |
@@ -1131,11 +1266,15 @@ discard block |
||
| 1131 | 1266 | $i = 0; |
| 1132 | 1267 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
| 1133 | 1268 | //$Connection->db->beginTransaction(); |
| 1134 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1269 | + if ($globalTransaction) { |
|
| 1270 | + $Connection->db->beginTransaction(); |
|
| 1271 | + } |
|
| 1135 | 1272 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1136 | 1273 | { |
| 1137 | 1274 | if ($i > 0) { |
| 1138 | - if ($data[1] == 'NULL') $data[1] = $data[0]; |
|
| 1275 | + if ($data[1] == 'NULL') { |
|
| 1276 | + $data[1] = $data[0]; |
|
| 1277 | + } |
|
| 1139 | 1278 | $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 | 1279 | try { |
| 1141 | 1280 | $sth = $Connection->db->prepare($query); |
@@ -1147,7 +1286,9 @@ discard block |
||
| 1147 | 1286 | $i++; |
| 1148 | 1287 | } |
| 1149 | 1288 | fclose($handle); |
| 1150 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1289 | + if ($globalTransaction) { |
|
| 1290 | + $Connection->db->commit(); |
|
| 1291 | + } |
|
| 1151 | 1292 | } |
| 1152 | 1293 | return ''; |
| 1153 | 1294 | } |
@@ -1168,7 +1309,9 @@ discard block |
||
| 1168 | 1309 | if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE) |
| 1169 | 1310 | { |
| 1170 | 1311 | $i = 0; |
| 1171 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1312 | + if ($globalTransaction) { |
|
| 1313 | + $Connection->db->beginTransaction(); |
|
| 1314 | + } |
|
| 1172 | 1315 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1173 | 1316 | { |
| 1174 | 1317 | if ($i > 0) { |
@@ -1184,7 +1327,9 @@ discard block |
||
| 1184 | 1327 | $i++; |
| 1185 | 1328 | } |
| 1186 | 1329 | fclose($handle); |
| 1187 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1330 | + if ($globalTransaction) { |
|
| 1331 | + $Connection->db->commit(); |
|
| 1332 | + } |
|
| 1188 | 1333 | } |
| 1189 | 1334 | return ''; |
| 1190 | 1335 | } |
@@ -1209,7 +1354,9 @@ discard block |
||
| 1209 | 1354 | $i = 0; |
| 1210 | 1355 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
| 1211 | 1356 | //$Connection->db->beginTransaction(); |
| 1212 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1357 | + if ($globalTransaction) { |
|
| 1358 | + $Connection->db->beginTransaction(); |
|
| 1359 | + } |
|
| 1213 | 1360 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1214 | 1361 | { |
| 1215 | 1362 | if ($i > 0) { |
@@ -1224,7 +1371,9 @@ discard block |
||
| 1224 | 1371 | $i++; |
| 1225 | 1372 | } |
| 1226 | 1373 | fclose($handle); |
| 1227 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1374 | + if ($globalTransaction) { |
|
| 1375 | + $Connection->db->commit(); |
|
| 1376 | + } |
|
| 1228 | 1377 | } |
| 1229 | 1378 | return ''; |
| 1230 | 1379 | } |
@@ -1249,7 +1398,9 @@ discard block |
||
| 1249 | 1398 | $i = 0; |
| 1250 | 1399 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
| 1251 | 1400 | //$Connection->db->beginTransaction(); |
| 1252 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1401 | + if ($globalTransaction) { |
|
| 1402 | + $Connection->db->beginTransaction(); |
|
| 1403 | + } |
|
| 1253 | 1404 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1254 | 1405 | { |
| 1255 | 1406 | if ($i > 0) { |
@@ -1265,7 +1416,9 @@ discard block |
||
| 1265 | 1416 | $i++; |
| 1266 | 1417 | } |
| 1267 | 1418 | fclose($handle); |
| 1268 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1419 | + if ($globalTransaction) { |
|
| 1420 | + $Connection->db->commit(); |
|
| 1421 | + } |
|
| 1269 | 1422 | } |
| 1270 | 1423 | return ''; |
| 1271 | 1424 | } |
@@ -1284,7 +1437,9 @@ discard block |
||
| 1284 | 1437 | $Connection = new Connection(); |
| 1285 | 1438 | if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE) |
| 1286 | 1439 | { |
| 1287 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1440 | + if ($globalTransaction) { |
|
| 1441 | + $Connection->db->beginTransaction(); |
|
| 1442 | + } |
|
| 1288 | 1443 | while (($data = fgetcsv($handle, 1000)) !== FALSE) |
| 1289 | 1444 | { |
| 1290 | 1445 | $query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL'; |
@@ -1299,7 +1454,9 @@ discard block |
||
| 1299 | 1454 | } |
| 1300 | 1455 | } |
| 1301 | 1456 | fclose($handle); |
| 1302 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1457 | + if ($globalTransaction) { |
|
| 1458 | + $Connection->db->commit(); |
|
| 1459 | + } |
|
| 1303 | 1460 | } |
| 1304 | 1461 | return ''; |
| 1305 | 1462 | } |
@@ -1450,7 +1607,9 @@ discard block |
||
| 1450 | 1607 | if (($handle = fopen($filename, 'r')) !== FALSE) |
| 1451 | 1608 | { |
| 1452 | 1609 | $i = 0; |
| 1453 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1610 | + if ($globalTransaction) { |
|
| 1611 | + $Connection->db->beginTransaction(); |
|
| 1612 | + } |
|
| 1454 | 1613 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1455 | 1614 | { |
| 1456 | 1615 | $i++; |
@@ -1478,7 +1637,9 @@ discard block |
||
| 1478 | 1637 | } |
| 1479 | 1638 | } |
| 1480 | 1639 | fclose($handle); |
| 1481 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1640 | + if ($globalTransaction) { |
|
| 1641 | + $Connection->db->commit(); |
|
| 1642 | + } |
|
| 1482 | 1643 | } |
| 1483 | 1644 | return ''; |
| 1484 | 1645 | } |
@@ -1501,7 +1662,9 @@ discard block |
||
| 1501 | 1662 | $Connection = new Connection(); |
| 1502 | 1663 | if (($handle = fopen($filename, 'r')) !== FALSE) |
| 1503 | 1664 | { |
| 1504 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1665 | + if ($globalTransaction) { |
|
| 1666 | + $Connection->db->beginTransaction(); |
|
| 1667 | + } |
|
| 1505 | 1668 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1506 | 1669 | { |
| 1507 | 1670 | if(count($row) > 1) { |
@@ -1515,7 +1678,9 @@ discard block |
||
| 1515 | 1678 | } |
| 1516 | 1679 | } |
| 1517 | 1680 | fclose($handle); |
| 1518 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1681 | + if ($globalTransaction) { |
|
| 1682 | + $Connection->db->commit(); |
|
| 1683 | + } |
|
| 1519 | 1684 | } |
| 1520 | 1685 | return ''; |
| 1521 | 1686 | } |
@@ -1535,8 +1700,9 @@ discard block |
||
| 1535 | 1700 | } |
| 1536 | 1701 | |
| 1537 | 1702 | |
| 1538 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1539 | - else { |
|
| 1703 | + if ($globalDBdriver == 'mysql') { |
|
| 1704 | + update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1705 | + } else { |
|
| 1540 | 1706 | update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
| 1541 | 1707 | $query = "CREATE EXTENSION postgis"; |
| 1542 | 1708 | $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
@@ -1555,20 +1721,30 @@ discard block |
||
| 1555 | 1721 | global $tmp_dir, $globalDebug; |
| 1556 | 1722 | include_once('class.create_db.php'); |
| 1557 | 1723 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1558 | - if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
|
| 1724 | + if ($globalDebug) { |
|
| 1725 | + echo "NOTAM from FlightAirMap website : Download..."; |
|
| 1726 | + } |
|
| 1559 | 1727 | update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
| 1560 | 1728 | $error = ''; |
| 1561 | 1729 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1562 | - if ($globalDebug) echo "Gunzip..."; |
|
| 1730 | + if ($globalDebug) { |
|
| 1731 | + echo "Gunzip..."; |
|
| 1732 | + } |
|
| 1563 | 1733 | update_db::gunzip($tmp_dir.'notam.txt.gz'); |
| 1564 | - if ($globalDebug) echo "Add to DB..."; |
|
| 1734 | + if ($globalDebug) { |
|
| 1735 | + echo "Add to DB..."; |
|
| 1736 | + } |
|
| 1565 | 1737 | //$error = create_db::import_file($tmp_dir.'notam.sql'); |
| 1566 | 1738 | $NOTAM = new NOTAM(); |
| 1567 | 1739 | $NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt'); |
| 1568 | - } else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
| 1740 | + } else { |
|
| 1741 | + $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
| 1742 | + } |
|
| 1569 | 1743 | if ($error != '') { |
| 1570 | 1744 | return $error; |
| 1571 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1745 | + } elseif ($globalDebug) { |
|
| 1746 | + echo "Done\n"; |
|
| 1747 | + } |
|
| 1572 | 1748 | return ''; |
| 1573 | 1749 | } |
| 1574 | 1750 | |
@@ -1622,67 +1798,111 @@ discard block |
||
| 1622 | 1798 | //if ($globalDebug) echo "IVAO : Download..."; |
| 1623 | 1799 | //update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip'); |
| 1624 | 1800 | if (file_exists($tmp_dir.'ivae_feb2013.zip')) { |
| 1625 | - if ($globalDebug) echo "Unzip..."; |
|
| 1801 | + if ($globalDebug) { |
|
| 1802 | + echo "Unzip..."; |
|
| 1803 | + } |
|
| 1626 | 1804 | update_db::unzip($tmp_dir.'ivae_feb2013.zip'); |
| 1627 | - if ($globalDebug) echo "Add to DB..."; |
|
| 1805 | + if ($globalDebug) { |
|
| 1806 | + echo "Add to DB..."; |
|
| 1807 | + } |
|
| 1628 | 1808 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 1629 | - if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
|
| 1809 | + if ($globalDebug) { |
|
| 1810 | + echo "Copy airlines logos to airlines images directory..."; |
|
| 1811 | + } |
|
| 1630 | 1812 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 1631 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1632 | - } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
| 1633 | - } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
| 1813 | + if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) { |
|
| 1814 | + $error = "Failed to copy airlines logo."; |
|
| 1815 | + } |
|
| 1816 | + } else { |
|
| 1817 | + $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
| 1818 | + } |
|
| 1819 | + } else { |
|
| 1820 | + $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
| 1821 | + } |
|
| 1634 | 1822 | if ($error != '') { |
| 1635 | 1823 | return $error; |
| 1636 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1824 | + } elseif ($globalDebug) { |
|
| 1825 | + echo "Done\n"; |
|
| 1826 | + } |
|
| 1637 | 1827 | return ''; |
| 1638 | 1828 | } |
| 1639 | 1829 | |
| 1640 | 1830 | public static function update_routes() { |
| 1641 | 1831 | global $tmp_dir, $globalDebug; |
| 1642 | 1832 | $error = ''; |
| 1643 | - if ($globalDebug) echo "Routes : Download..."; |
|
| 1833 | + if ($globalDebug) { |
|
| 1834 | + echo "Routes : Download..."; |
|
| 1835 | + } |
|
| 1644 | 1836 | update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
| 1645 | 1837 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 1646 | - if ($globalDebug) echo "Gunzip..."; |
|
| 1838 | + if ($globalDebug) { |
|
| 1839 | + echo "Gunzip..."; |
|
| 1840 | + } |
|
| 1647 | 1841 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
| 1648 | - if ($globalDebug) echo "Add to DB..."; |
|
| 1842 | + if ($globalDebug) { |
|
| 1843 | + echo "Add to DB..."; |
|
| 1844 | + } |
|
| 1649 | 1845 | $error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb'); |
| 1650 | - } else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
| 1846 | + } else { |
|
| 1847 | + $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
| 1848 | + } |
|
| 1651 | 1849 | if ($error != '') { |
| 1652 | 1850 | return $error; |
| 1653 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1851 | + } elseif ($globalDebug) { |
|
| 1852 | + echo "Done\n"; |
|
| 1853 | + } |
|
| 1654 | 1854 | return ''; |
| 1655 | 1855 | } |
| 1656 | 1856 | public static function update_oneworld() { |
| 1657 | 1857 | global $tmp_dir, $globalDebug; |
| 1658 | 1858 | $error = ''; |
| 1659 | - if ($globalDebug) echo "Schedules Oneworld : Download..."; |
|
| 1859 | + if ($globalDebug) { |
|
| 1860 | + echo "Schedules Oneworld : Download..."; |
|
| 1861 | + } |
|
| 1660 | 1862 | update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
| 1661 | 1863 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 1662 | - if ($globalDebug) echo "Gunzip..."; |
|
| 1864 | + if ($globalDebug) { |
|
| 1865 | + echo "Gunzip..."; |
|
| 1866 | + } |
|
| 1663 | 1867 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
| 1664 | - if ($globalDebug) echo "Add to DB..."; |
|
| 1868 | + if ($globalDebug) { |
|
| 1869 | + echo "Add to DB..."; |
|
| 1870 | + } |
|
| 1665 | 1871 | $error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv'); |
| 1666 | - } else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
| 1872 | + } else { |
|
| 1873 | + $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
| 1874 | + } |
|
| 1667 | 1875 | if ($error != '') { |
| 1668 | 1876 | return $error; |
| 1669 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1877 | + } elseif ($globalDebug) { |
|
| 1878 | + echo "Done\n"; |
|
| 1879 | + } |
|
| 1670 | 1880 | return ''; |
| 1671 | 1881 | } |
| 1672 | 1882 | public static function update_skyteam() { |
| 1673 | 1883 | global $tmp_dir, $globalDebug; |
| 1674 | 1884 | $error = ''; |
| 1675 | - if ($globalDebug) echo "Schedules Skyteam : Download..."; |
|
| 1885 | + if ($globalDebug) { |
|
| 1886 | + echo "Schedules Skyteam : Download..."; |
|
| 1887 | + } |
|
| 1676 | 1888 | update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
| 1677 | 1889 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 1678 | - if ($globalDebug) echo "Gunzip..."; |
|
| 1890 | + if ($globalDebug) { |
|
| 1891 | + echo "Gunzip..."; |
|
| 1892 | + } |
|
| 1679 | 1893 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
| 1680 | - if ($globalDebug) echo "Add to DB..."; |
|
| 1894 | + if ($globalDebug) { |
|
| 1895 | + echo "Add to DB..."; |
|
| 1896 | + } |
|
| 1681 | 1897 | $error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv'); |
| 1682 | - } else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
| 1898 | + } else { |
|
| 1899 | + $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
| 1900 | + } |
|
| 1683 | 1901 | if ($error != '') { |
| 1684 | 1902 | return $error; |
| 1685 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1903 | + } elseif ($globalDebug) { |
|
| 1904 | + echo "Done\n"; |
|
| 1905 | + } |
|
| 1686 | 1906 | return ''; |
| 1687 | 1907 | } |
| 1688 | 1908 | public static function update_ModeS() { |
@@ -1699,355 +1919,619 @@ discard block |
||
| 1699 | 1919 | exit; |
| 1700 | 1920 | } elseif ($globalDebug) echo "Done\n"; |
| 1701 | 1921 | */ |
| 1702 | - if ($globalDebug) echo "Modes : Download..."; |
|
| 1703 | -// update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
| 1922 | + if ($globalDebug) { |
|
| 1923 | + echo "Modes : Download..."; |
|
| 1924 | + } |
|
| 1925 | + // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
| 1704 | 1926 | update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
| 1705 | 1927 | |
| 1706 | 1928 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 1707 | 1929 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
| 1708 | - if ($globalDebug) echo "Unzip..."; |
|
| 1709 | -// update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
| 1930 | + if ($globalDebug) { |
|
| 1931 | + echo "Unzip..."; |
|
| 1932 | + } |
|
| 1933 | + // update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
| 1710 | 1934 | update_db::gunzip($tmp_dir.'BaseStation.sqb.gz'); |
| 1711 | - if ($globalDebug) echo "Add to DB..."; |
|
| 1935 | + if ($globalDebug) { |
|
| 1936 | + echo "Add to DB..."; |
|
| 1937 | + } |
|
| 1712 | 1938 | $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb'); |
| 1713 | 1939 | // $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb'); |
| 1714 | - } else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
| 1940 | + } else { |
|
| 1941 | + $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
| 1942 | + } |
|
| 1715 | 1943 | if ($error != '') { |
| 1716 | 1944 | return $error; |
| 1717 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1945 | + } elseif ($globalDebug) { |
|
| 1946 | + echo "Done\n"; |
|
| 1947 | + } |
|
| 1718 | 1948 | return ''; |
| 1719 | 1949 | } |
| 1720 | 1950 | |
| 1721 | 1951 | public static function update_ModeS_faa() { |
| 1722 | 1952 | global $tmp_dir, $globalDebug; |
| 1723 | - if ($globalDebug) echo "Modes FAA: Download..."; |
|
| 1953 | + if ($globalDebug) { |
|
| 1954 | + echo "Modes FAA: Download..."; |
|
| 1955 | + } |
|
| 1724 | 1956 | update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
| 1725 | 1957 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 1726 | - if ($globalDebug) echo "Unzip..."; |
|
| 1958 | + if ($globalDebug) { |
|
| 1959 | + echo "Unzip..."; |
|
| 1960 | + } |
|
| 1727 | 1961 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
| 1728 | - if ($globalDebug) echo "Add to DB..."; |
|
| 1962 | + if ($globalDebug) { |
|
| 1963 | + echo "Add to DB..."; |
|
| 1964 | + } |
|
| 1729 | 1965 | $error = update_db::modes_faa(); |
| 1730 | - } else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
| 1966 | + } else { |
|
| 1967 | + $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
| 1968 | + } |
|
| 1731 | 1969 | if ($error != '') { |
| 1732 | 1970 | return $error; |
| 1733 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1971 | + } elseif ($globalDebug) { |
|
| 1972 | + echo "Done\n"; |
|
| 1973 | + } |
|
| 1734 | 1974 | return ''; |
| 1735 | 1975 | } |
| 1736 | 1976 | |
| 1737 | 1977 | public static function update_ModeS_flarm() { |
| 1738 | 1978 | global $tmp_dir, $globalDebug; |
| 1739 | - if ($globalDebug) echo "Modes Flarmnet: Download..."; |
|
| 1979 | + if ($globalDebug) { |
|
| 1980 | + echo "Modes Flarmnet: Download..."; |
|
| 1981 | + } |
|
| 1740 | 1982 | update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
| 1741 | 1983 | if (file_exists($tmp_dir.'data.fln')) { |
| 1742 | - if ($globalDebug) echo "Add to DB..."; |
|
| 1984 | + if ($globalDebug) { |
|
| 1985 | + echo "Add to DB..."; |
|
| 1986 | + } |
|
| 1743 | 1987 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
| 1744 | - } else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
| 1988 | + } else { |
|
| 1989 | + $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
| 1990 | + } |
|
| 1745 | 1991 | if ($error != '') { |
| 1746 | 1992 | return $error; |
| 1747 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1993 | + } elseif ($globalDebug) { |
|
| 1994 | + echo "Done\n"; |
|
| 1995 | + } |
|
| 1748 | 1996 | return ''; |
| 1749 | 1997 | } |
| 1750 | 1998 | |
| 1751 | 1999 | public static function update_ModeS_ogn() { |
| 1752 | 2000 | global $tmp_dir, $globalDebug; |
| 1753 | - if ($globalDebug) echo "Modes OGN: Download..."; |
|
| 2001 | + if ($globalDebug) { |
|
| 2002 | + echo "Modes OGN: Download..."; |
|
| 2003 | + } |
|
| 1754 | 2004 | update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
| 1755 | 2005 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 1756 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2006 | + if ($globalDebug) { |
|
| 2007 | + echo "Add to DB..."; |
|
| 2008 | + } |
|
| 1757 | 2009 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
| 1758 | - } else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
| 2010 | + } else { |
|
| 2011 | + $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
| 2012 | + } |
|
| 1759 | 2013 | if ($error != '') { |
| 1760 | 2014 | return $error; |
| 1761 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2015 | + } elseif ($globalDebug) { |
|
| 2016 | + echo "Done\n"; |
|
| 2017 | + } |
|
| 1762 | 2018 | return ''; |
| 1763 | 2019 | } |
| 1764 | 2020 | |
| 1765 | 2021 | public static function update_owner() { |
| 1766 | 2022 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 1767 | 2023 | |
| 1768 | - if ($globalDebug) echo "Owner France: Download..."; |
|
| 2024 | + if ($globalDebug) { |
|
| 2025 | + echo "Owner France: Download..."; |
|
| 2026 | + } |
|
| 1769 | 2027 | update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
| 1770 | 2028 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 1771 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2029 | + if ($globalDebug) { |
|
| 2030 | + echo "Add to DB..."; |
|
| 2031 | + } |
|
| 1772 | 2032 | $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
| 1773 | - } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
| 2033 | + } else { |
|
| 2034 | + $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
| 2035 | + } |
|
| 1774 | 2036 | if ($error != '') { |
| 1775 | 2037 | return $error; |
| 1776 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2038 | + } elseif ($globalDebug) { |
|
| 2039 | + echo "Done\n"; |
|
| 2040 | + } |
|
| 1777 | 2041 | |
| 1778 | - if ($globalDebug) echo "Owner Ireland: Download..."; |
|
| 2042 | + if ($globalDebug) { |
|
| 2043 | + echo "Owner Ireland: Download..."; |
|
| 2044 | + } |
|
| 1779 | 2045 | update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
| 1780 | 2046 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 1781 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2047 | + if ($globalDebug) { |
|
| 2048 | + echo "Add to DB..."; |
|
| 2049 | + } |
|
| 1782 | 2050 | $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
| 1783 | - } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
| 2051 | + } else { |
|
| 2052 | + $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
| 2053 | + } |
|
| 1784 | 2054 | if ($error != '') { |
| 1785 | 2055 | return $error; |
| 1786 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1787 | - if ($globalDebug) echo "Owner Switzerland: Download..."; |
|
| 2056 | + } elseif ($globalDebug) { |
|
| 2057 | + echo "Done\n"; |
|
| 2058 | + } |
|
| 2059 | + if ($globalDebug) { |
|
| 2060 | + echo "Owner Switzerland: Download..."; |
|
| 2061 | + } |
|
| 1788 | 2062 | update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
| 1789 | 2063 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 1790 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2064 | + if ($globalDebug) { |
|
| 2065 | + echo "Add to DB..."; |
|
| 2066 | + } |
|
| 1791 | 2067 | $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
| 1792 | - } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
| 2068 | + } else { |
|
| 2069 | + $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
| 2070 | + } |
|
| 1793 | 2071 | if ($error != '') { |
| 1794 | 2072 | return $error; |
| 1795 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1796 | - if ($globalDebug) echo "Owner Czech Republic: Download..."; |
|
| 2073 | + } elseif ($globalDebug) { |
|
| 2074 | + echo "Done\n"; |
|
| 2075 | + } |
|
| 2076 | + if ($globalDebug) { |
|
| 2077 | + echo "Owner Czech Republic: Download..."; |
|
| 2078 | + } |
|
| 1797 | 2079 | update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
| 1798 | 2080 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 1799 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2081 | + if ($globalDebug) { |
|
| 2082 | + echo "Add to DB..."; |
|
| 2083 | + } |
|
| 1800 | 2084 | $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
| 1801 | - } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
| 2085 | + } else { |
|
| 2086 | + $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
| 2087 | + } |
|
| 1802 | 2088 | if ($error != '') { |
| 1803 | 2089 | return $error; |
| 1804 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1805 | - if ($globalDebug) echo "Owner Australia: Download..."; |
|
| 2090 | + } elseif ($globalDebug) { |
|
| 2091 | + echo "Done\n"; |
|
| 2092 | + } |
|
| 2093 | + if ($globalDebug) { |
|
| 2094 | + echo "Owner Australia: Download..."; |
|
| 2095 | + } |
|
| 1806 | 2096 | update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
| 1807 | 2097 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 1808 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2098 | + if ($globalDebug) { |
|
| 2099 | + echo "Add to DB..."; |
|
| 2100 | + } |
|
| 1809 | 2101 | $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
| 1810 | - } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
| 2102 | + } else { |
|
| 2103 | + $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
| 2104 | + } |
|
| 1811 | 2105 | if ($error != '') { |
| 1812 | 2106 | return $error; |
| 1813 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1814 | - if ($globalDebug) echo "Owner Austria: Download..."; |
|
| 2107 | + } elseif ($globalDebug) { |
|
| 2108 | + echo "Done\n"; |
|
| 2109 | + } |
|
| 2110 | + if ($globalDebug) { |
|
| 2111 | + echo "Owner Austria: Download..."; |
|
| 2112 | + } |
|
| 1815 | 2113 | update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
| 1816 | 2114 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 1817 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2115 | + if ($globalDebug) { |
|
| 2116 | + echo "Add to DB..."; |
|
| 2117 | + } |
|
| 1818 | 2118 | $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
| 1819 | - } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
| 2119 | + } else { |
|
| 2120 | + $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
| 2121 | + } |
|
| 1820 | 2122 | if ($error != '') { |
| 1821 | 2123 | return $error; |
| 1822 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1823 | - if ($globalDebug) echo "Owner Chile: Download..."; |
|
| 2124 | + } elseif ($globalDebug) { |
|
| 2125 | + echo "Done\n"; |
|
| 2126 | + } |
|
| 2127 | + if ($globalDebug) { |
|
| 2128 | + echo "Owner Chile: Download..."; |
|
| 2129 | + } |
|
| 1824 | 2130 | update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
| 1825 | 2131 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 1826 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2132 | + if ($globalDebug) { |
|
| 2133 | + echo "Add to DB..."; |
|
| 2134 | + } |
|
| 1827 | 2135 | $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
| 1828 | - } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
| 2136 | + } else { |
|
| 2137 | + $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
| 2138 | + } |
|
| 1829 | 2139 | if ($error != '') { |
| 1830 | 2140 | return $error; |
| 1831 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1832 | - if ($globalDebug) echo "Owner Colombia: Download..."; |
|
| 2141 | + } elseif ($globalDebug) { |
|
| 2142 | + echo "Done\n"; |
|
| 2143 | + } |
|
| 2144 | + if ($globalDebug) { |
|
| 2145 | + echo "Owner Colombia: Download..."; |
|
| 2146 | + } |
|
| 1833 | 2147 | update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
| 1834 | 2148 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 1835 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2149 | + if ($globalDebug) { |
|
| 2150 | + echo "Add to DB..."; |
|
| 2151 | + } |
|
| 1836 | 2152 | $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
| 1837 | - } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
| 2153 | + } else { |
|
| 2154 | + $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
| 2155 | + } |
|
| 1838 | 2156 | if ($error != '') { |
| 1839 | 2157 | return $error; |
| 1840 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1841 | - if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
|
| 2158 | + } elseif ($globalDebug) { |
|
| 2159 | + echo "Done\n"; |
|
| 2160 | + } |
|
| 2161 | + if ($globalDebug) { |
|
| 2162 | + echo "Owner Bosnia Herzegobina: Download..."; |
|
| 2163 | + } |
|
| 1842 | 2164 | update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
| 1843 | 2165 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 1844 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2166 | + if ($globalDebug) { |
|
| 2167 | + echo "Add to DB..."; |
|
| 2168 | + } |
|
| 1845 | 2169 | $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
| 1846 | - } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
| 2170 | + } else { |
|
| 2171 | + $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
| 2172 | + } |
|
| 1847 | 2173 | if ($error != '') { |
| 1848 | 2174 | return $error; |
| 1849 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1850 | - if ($globalDebug) echo "Owner Brazil: Download..."; |
|
| 2175 | + } elseif ($globalDebug) { |
|
| 2176 | + echo "Done\n"; |
|
| 2177 | + } |
|
| 2178 | + if ($globalDebug) { |
|
| 2179 | + echo "Owner Brazil: Download..."; |
|
| 2180 | + } |
|
| 1851 | 2181 | update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
| 1852 | 2182 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 1853 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2183 | + if ($globalDebug) { |
|
| 2184 | + echo "Add to DB..."; |
|
| 2185 | + } |
|
| 1854 | 2186 | $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
| 1855 | - } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
| 2187 | + } else { |
|
| 2188 | + $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
| 2189 | + } |
|
| 1856 | 2190 | if ($error != '') { |
| 1857 | 2191 | return $error; |
| 1858 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1859 | - if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
|
| 2192 | + } elseif ($globalDebug) { |
|
| 2193 | + echo "Done\n"; |
|
| 2194 | + } |
|
| 2195 | + if ($globalDebug) { |
|
| 2196 | + echo "Owner Cayman Islands: Download..."; |
|
| 2197 | + } |
|
| 1860 | 2198 | update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
| 1861 | 2199 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 1862 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2200 | + if ($globalDebug) { |
|
| 2201 | + echo "Add to DB..."; |
|
| 2202 | + } |
|
| 1863 | 2203 | $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
| 1864 | - } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
| 2204 | + } else { |
|
| 2205 | + $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
| 2206 | + } |
|
| 1865 | 2207 | if ($error != '') { |
| 1866 | 2208 | return $error; |
| 1867 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1868 | - if ($globalDebug) echo "Owner Croatia: Download..."; |
|
| 2209 | + } elseif ($globalDebug) { |
|
| 2210 | + echo "Done\n"; |
|
| 2211 | + } |
|
| 2212 | + if ($globalDebug) { |
|
| 2213 | + echo "Owner Croatia: Download..."; |
|
| 2214 | + } |
|
| 1869 | 2215 | update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
| 1870 | 2216 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 1871 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2217 | + if ($globalDebug) { |
|
| 2218 | + echo "Add to DB..."; |
|
| 2219 | + } |
|
| 1872 | 2220 | $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
| 1873 | - } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
| 2221 | + } else { |
|
| 2222 | + $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
| 2223 | + } |
|
| 1874 | 2224 | if ($error != '') { |
| 1875 | 2225 | return $error; |
| 1876 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1877 | - if ($globalDebug) echo "Owner Luxembourg: Download..."; |
|
| 2226 | + } elseif ($globalDebug) { |
|
| 2227 | + echo "Done\n"; |
|
| 2228 | + } |
|
| 2229 | + if ($globalDebug) { |
|
| 2230 | + echo "Owner Luxembourg: Download..."; |
|
| 2231 | + } |
|
| 1878 | 2232 | update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
| 1879 | 2233 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 1880 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2234 | + if ($globalDebug) { |
|
| 2235 | + echo "Add to DB..."; |
|
| 2236 | + } |
|
| 1881 | 2237 | $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
| 1882 | - } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
| 2238 | + } else { |
|
| 2239 | + $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
| 2240 | + } |
|
| 1883 | 2241 | if ($error != '') { |
| 1884 | 2242 | return $error; |
| 1885 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1886 | - if ($globalDebug) echo "Owner Maldives: Download..."; |
|
| 2243 | + } elseif ($globalDebug) { |
|
| 2244 | + echo "Done\n"; |
|
| 2245 | + } |
|
| 2246 | + if ($globalDebug) { |
|
| 2247 | + echo "Owner Maldives: Download..."; |
|
| 2248 | + } |
|
| 1887 | 2249 | update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
| 1888 | 2250 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 1889 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2251 | + if ($globalDebug) { |
|
| 2252 | + echo "Add to DB..."; |
|
| 2253 | + } |
|
| 1890 | 2254 | $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
| 1891 | - } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
| 2255 | + } else { |
|
| 2256 | + $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
| 2257 | + } |
|
| 1892 | 2258 | if ($error != '') { |
| 1893 | 2259 | return $error; |
| 1894 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1895 | - if ($globalDebug) echo "Owner New Zealand: Download..."; |
|
| 2260 | + } elseif ($globalDebug) { |
|
| 2261 | + echo "Done\n"; |
|
| 2262 | + } |
|
| 2263 | + if ($globalDebug) { |
|
| 2264 | + echo "Owner New Zealand: Download..."; |
|
| 2265 | + } |
|
| 1896 | 2266 | update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
| 1897 | 2267 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 1898 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2268 | + if ($globalDebug) { |
|
| 2269 | + echo "Add to DB..."; |
|
| 2270 | + } |
|
| 1899 | 2271 | $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
| 1900 | - } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
| 2272 | + } else { |
|
| 2273 | + $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
| 2274 | + } |
|
| 1901 | 2275 | if ($error != '') { |
| 1902 | 2276 | return $error; |
| 1903 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1904 | - if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
|
| 2277 | + } elseif ($globalDebug) { |
|
| 2278 | + echo "Done\n"; |
|
| 2279 | + } |
|
| 2280 | + if ($globalDebug) { |
|
| 2281 | + echo "Owner Papua New Guinea: Download..."; |
|
| 2282 | + } |
|
| 1905 | 2283 | update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
| 1906 | 2284 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 1907 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2285 | + if ($globalDebug) { |
|
| 2286 | + echo "Add to DB..."; |
|
| 2287 | + } |
|
| 1908 | 2288 | $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
| 1909 | - } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
| 2289 | + } else { |
|
| 2290 | + $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
| 2291 | + } |
|
| 1910 | 2292 | if ($error != '') { |
| 1911 | 2293 | return $error; |
| 1912 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1913 | - if ($globalDebug) echo "Owner Slovakia: Download..."; |
|
| 2294 | + } elseif ($globalDebug) { |
|
| 2295 | + echo "Done\n"; |
|
| 2296 | + } |
|
| 2297 | + if ($globalDebug) { |
|
| 2298 | + echo "Owner Slovakia: Download..."; |
|
| 2299 | + } |
|
| 1914 | 2300 | update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
| 1915 | 2301 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 1916 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2302 | + if ($globalDebug) { |
|
| 2303 | + echo "Add to DB..."; |
|
| 2304 | + } |
|
| 1917 | 2305 | $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
| 1918 | - } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
| 2306 | + } else { |
|
| 2307 | + $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
| 2308 | + } |
|
| 1919 | 2309 | if ($error != '') { |
| 1920 | 2310 | return $error; |
| 1921 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1922 | - if ($globalDebug) echo "Owner Ecuador: Download..."; |
|
| 2311 | + } elseif ($globalDebug) { |
|
| 2312 | + echo "Done\n"; |
|
| 2313 | + } |
|
| 2314 | + if ($globalDebug) { |
|
| 2315 | + echo "Owner Ecuador: Download..."; |
|
| 2316 | + } |
|
| 1923 | 2317 | update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
| 1924 | 2318 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 1925 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2319 | + if ($globalDebug) { |
|
| 2320 | + echo "Add to DB..."; |
|
| 2321 | + } |
|
| 1926 | 2322 | $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
| 1927 | - } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
| 2323 | + } else { |
|
| 2324 | + $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
| 2325 | + } |
|
| 1928 | 2326 | if ($error != '') { |
| 1929 | 2327 | return $error; |
| 1930 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1931 | - if ($globalDebug) echo "Owner Iceland: Download..."; |
|
| 2328 | + } elseif ($globalDebug) { |
|
| 2329 | + echo "Done\n"; |
|
| 2330 | + } |
|
| 2331 | + if ($globalDebug) { |
|
| 2332 | + echo "Owner Iceland: Download..."; |
|
| 2333 | + } |
|
| 1932 | 2334 | update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
| 1933 | 2335 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 1934 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2336 | + if ($globalDebug) { |
|
| 2337 | + echo "Add to DB..."; |
|
| 2338 | + } |
|
| 1935 | 2339 | $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
| 1936 | - } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
| 2340 | + } else { |
|
| 2341 | + $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
| 2342 | + } |
|
| 1937 | 2343 | if ($error != '') { |
| 1938 | 2344 | return $error; |
| 1939 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1940 | - if ($globalDebug) echo "Owner Isle of Man: Download..."; |
|
| 2345 | + } elseif ($globalDebug) { |
|
| 2346 | + echo "Done\n"; |
|
| 2347 | + } |
|
| 2348 | + if ($globalDebug) { |
|
| 2349 | + echo "Owner Isle of Man: Download..."; |
|
| 2350 | + } |
|
| 1941 | 2351 | update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
| 1942 | 2352 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 1943 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2353 | + if ($globalDebug) { |
|
| 2354 | + echo "Add to DB..."; |
|
| 2355 | + } |
|
| 1944 | 2356 | $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
| 1945 | - } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
| 2357 | + } else { |
|
| 2358 | + $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
| 2359 | + } |
|
| 1946 | 2360 | if ($error != '') { |
| 1947 | 2361 | return $error; |
| 1948 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2362 | + } elseif ($globalDebug) { |
|
| 2363 | + echo "Done\n"; |
|
| 2364 | + } |
|
| 1949 | 2365 | if ($globalMasterSource) { |
| 1950 | - if ($globalDebug) echo "ModeS Netherlands: Download..."; |
|
| 2366 | + if ($globalDebug) { |
|
| 2367 | + echo "ModeS Netherlands: Download..."; |
|
| 2368 | + } |
|
| 1951 | 2369 | update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
| 1952 | 2370 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 1953 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2371 | + if ($globalDebug) { |
|
| 2372 | + echo "Add to DB..."; |
|
| 2373 | + } |
|
| 1954 | 2374 | $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
| 1955 | - } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
| 2375 | + } else { |
|
| 2376 | + $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
| 2377 | + } |
|
| 1956 | 2378 | if ($error != '') { |
| 1957 | 2379 | return $error; |
| 1958 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1959 | - if ($globalDebug) echo "ModeS Denmark: Download..."; |
|
| 2380 | + } elseif ($globalDebug) { |
|
| 2381 | + echo "Done\n"; |
|
| 2382 | + } |
|
| 2383 | + if ($globalDebug) { |
|
| 2384 | + echo "ModeS Denmark: Download..."; |
|
| 2385 | + } |
|
| 1960 | 2386 | update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
| 1961 | 2387 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 1962 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2388 | + if ($globalDebug) { |
|
| 2389 | + echo "Add to DB..."; |
|
| 2390 | + } |
|
| 1963 | 2391 | $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
| 1964 | - } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
| 2392 | + } else { |
|
| 2393 | + $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
| 2394 | + } |
|
| 1965 | 2395 | if ($error != '') { |
| 1966 | 2396 | return $error; |
| 1967 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 1968 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2397 | + } elseif ($globalDebug) { |
|
| 2398 | + echo "Done\n"; |
|
| 2399 | + } |
|
| 2400 | + } elseif ($globalDebug) { |
|
| 2401 | + echo "Done\n"; |
|
| 2402 | + } |
|
| 1969 | 2403 | return ''; |
| 1970 | 2404 | } |
| 1971 | 2405 | |
| 1972 | 2406 | public static function update_translation() { |
| 1973 | 2407 | global $tmp_dir, $globalDebug; |
| 1974 | 2408 | $error = ''; |
| 1975 | - if ($globalDebug) echo "Translation : Download..."; |
|
| 2409 | + if ($globalDebug) { |
|
| 2410 | + echo "Translation : Download..."; |
|
| 2411 | + } |
|
| 1976 | 2412 | update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
| 1977 | 2413 | if (file_exists($tmp_dir.'translation.zip')) { |
| 1978 | - if ($globalDebug) echo "Unzip..."; |
|
| 2414 | + if ($globalDebug) { |
|
| 2415 | + echo "Unzip..."; |
|
| 2416 | + } |
|
| 1979 | 2417 | update_db::unzip($tmp_dir.'translation.zip'); |
| 1980 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2418 | + if ($globalDebug) { |
|
| 2419 | + echo "Add to DB..."; |
|
| 2420 | + } |
|
| 1981 | 2421 | $error = update_db::translation(); |
| 1982 | - } else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
| 2422 | + } else { |
|
| 2423 | + $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
| 2424 | + } |
|
| 1983 | 2425 | if ($error != '') { |
| 1984 | 2426 | return $error; |
| 1985 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2427 | + } elseif ($globalDebug) { |
|
| 2428 | + echo "Done\n"; |
|
| 2429 | + } |
|
| 1986 | 2430 | return ''; |
| 1987 | 2431 | } |
| 1988 | 2432 | |
| 1989 | 2433 | public static function update_translation_fam() { |
| 1990 | 2434 | global $tmp_dir, $globalDebug; |
| 1991 | - if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
|
| 2435 | + if ($globalDebug) { |
|
| 2436 | + echo "Translation from FlightAirMap website : Download..."; |
|
| 2437 | + } |
|
| 1992 | 2438 | update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
| 1993 | 2439 | if (file_exists($tmp_dir.'translation.tsv.gz')) { |
| 1994 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2440 | + if ($globalDebug) { |
|
| 2441 | + echo "Gunzip..."; |
|
| 2442 | + } |
|
| 1995 | 2443 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
| 1996 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2444 | + if ($globalDebug) { |
|
| 2445 | + echo "Add to DB..."; |
|
| 2446 | + } |
|
| 1997 | 2447 | $error = update_db::translation_fam(); |
| 1998 | - } else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
| 2448 | + } else { |
|
| 2449 | + $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
| 2450 | + } |
|
| 1999 | 2451 | if ($error != '') { |
| 2000 | 2452 | return $error; |
| 2001 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2453 | + } elseif ($globalDebug) { |
|
| 2454 | + echo "Done\n"; |
|
| 2455 | + } |
|
| 2002 | 2456 | return ''; |
| 2003 | 2457 | } |
| 2004 | 2458 | public static function update_ModeS_fam() { |
| 2005 | 2459 | global $tmp_dir, $globalDebug; |
| 2006 | - if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
|
| 2460 | + if ($globalDebug) { |
|
| 2461 | + echo "ModeS from FlightAirMap website : Download..."; |
|
| 2462 | + } |
|
| 2007 | 2463 | update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
| 2008 | 2464 | if (file_exists($tmp_dir.'modes.tsv.gz')) { |
| 2009 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2465 | + if ($globalDebug) { |
|
| 2466 | + echo "Gunzip..."; |
|
| 2467 | + } |
|
| 2010 | 2468 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
| 2011 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2469 | + if ($globalDebug) { |
|
| 2470 | + echo "Add to DB..."; |
|
| 2471 | + } |
|
| 2012 | 2472 | $error = update_db::modes_fam(); |
| 2013 | - } else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
| 2473 | + } else { |
|
| 2474 | + $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
| 2475 | + } |
|
| 2014 | 2476 | if ($error != '') { |
| 2015 | 2477 | return $error; |
| 2016 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2478 | + } elseif ($globalDebug) { |
|
| 2479 | + echo "Done\n"; |
|
| 2480 | + } |
|
| 2017 | 2481 | return ''; |
| 2018 | 2482 | } |
| 2019 | 2483 | public static function update_owner_fam() { |
| 2020 | 2484 | global $tmp_dir, $globalDebug, $globalOwner; |
| 2021 | - if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
|
| 2485 | + if ($globalDebug) { |
|
| 2486 | + echo "owner from FlightAirMap website : Download..."; |
|
| 2487 | + } |
|
| 2022 | 2488 | if ($globalOwner === TRUE) { |
| 2023 | 2489 | update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
| 2024 | 2490 | } else { |
| 2025 | 2491 | update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
| 2026 | 2492 | } |
| 2027 | 2493 | if (file_exists($tmp_dir.'owners.tsv.gz')) { |
| 2028 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2494 | + if ($globalDebug) { |
|
| 2495 | + echo "Gunzip..."; |
|
| 2496 | + } |
|
| 2029 | 2497 | update_db::gunzip($tmp_dir.'owners.tsv.gz'); |
| 2030 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2498 | + if ($globalDebug) { |
|
| 2499 | + echo "Add to DB..."; |
|
| 2500 | + } |
|
| 2031 | 2501 | $error = update_db::owner_fam(); |
| 2032 | - } else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
| 2502 | + } else { |
|
| 2503 | + $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
| 2504 | + } |
|
| 2033 | 2505 | if ($error != '') { |
| 2034 | 2506 | return $error; |
| 2035 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2507 | + } elseif ($globalDebug) { |
|
| 2508 | + echo "Done\n"; |
|
| 2509 | + } |
|
| 2036 | 2510 | return ''; |
| 2037 | 2511 | } |
| 2038 | 2512 | public static function update_routes_fam() { |
| 2039 | 2513 | global $tmp_dir, $globalDebug; |
| 2040 | - if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
|
| 2514 | + if ($globalDebug) { |
|
| 2515 | + echo "Routes from FlightAirMap website : Download..."; |
|
| 2516 | + } |
|
| 2041 | 2517 | update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
| 2042 | 2518 | if (file_exists($tmp_dir.'routes.tsv.gz')) { |
| 2043 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2519 | + if ($globalDebug) { |
|
| 2520 | + echo "Gunzip..."; |
|
| 2521 | + } |
|
| 2044 | 2522 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
| 2045 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2523 | + if ($globalDebug) { |
|
| 2524 | + echo "Add to DB..."; |
|
| 2525 | + } |
|
| 2046 | 2526 | $error = update_db::routes_fam(); |
| 2047 | - } else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
| 2527 | + } else { |
|
| 2528 | + $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
| 2529 | + } |
|
| 2048 | 2530 | if ($error != '') { |
| 2049 | 2531 | return $error; |
| 2050 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2532 | + } elseif ($globalDebug) { |
|
| 2533 | + echo "Done\n"; |
|
| 2534 | + } |
|
| 2051 | 2535 | return ''; |
| 2052 | 2536 | } |
| 2053 | 2537 | public static function update_marine_identity_fam() { |
@@ -2057,14 +2541,22 @@ discard block |
||
| 2057 | 2541 | $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
| 2058 | 2542 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2059 | 2543 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2060 | - if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
|
| 2544 | + if ($globalDebug) { |
|
| 2545 | + echo "Marine identity from FlightAirMap website : Download..."; |
|
| 2546 | + } |
|
| 2061 | 2547 | update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
| 2062 | 2548 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2063 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2549 | + if ($globalDebug) { |
|
| 2550 | + echo "Gunzip..."; |
|
| 2551 | + } |
|
| 2064 | 2552 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
| 2065 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2553 | + if ($globalDebug) { |
|
| 2554 | + echo "Add to DB..."; |
|
| 2555 | + } |
|
| 2066 | 2556 | $error = update_db::marine_identity_fam(); |
| 2067 | - } else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
| 2557 | + } else { |
|
| 2558 | + $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
| 2559 | + } |
|
| 2068 | 2560 | if ($error != '') { |
| 2069 | 2561 | return $error; |
| 2070 | 2562 | } elseif ($globalDebug) { |
@@ -2077,17 +2569,25 @@ discard block |
||
| 2077 | 2569 | } |
| 2078 | 2570 | public static function update_banned_fam() { |
| 2079 | 2571 | global $tmp_dir, $globalDebug; |
| 2080 | - if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
| 2572 | + if ($globalDebug) { |
|
| 2573 | + echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
| 2574 | + } |
|
| 2081 | 2575 | update_db::download('http://data.flightairmap.fr/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
| 2082 | 2576 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2083 | 2577 | //if ($globalDebug) echo "Gunzip..."; |
| 2084 | 2578 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
| 2085 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2579 | + if ($globalDebug) { |
|
| 2580 | + echo "Add to DB..."; |
|
| 2581 | + } |
|
| 2086 | 2582 | $error = update_db::banned_fam(); |
| 2087 | - } else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
| 2583 | + } else { |
|
| 2584 | + $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
| 2585 | + } |
|
| 2088 | 2586 | if ($error != '') { |
| 2089 | 2587 | return $error; |
| 2090 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2588 | + } elseif ($globalDebug) { |
|
| 2589 | + echo "Done\n"; |
|
| 2590 | + } |
|
| 2091 | 2591 | return ''; |
| 2092 | 2592 | } |
| 2093 | 2593 | |
@@ -2095,7 +2595,9 @@ discard block |
||
| 2095 | 2595 | global $tmp_dir, $globalDebug, $globalDBdriver; |
| 2096 | 2596 | include_once('class.create_db.php'); |
| 2097 | 2597 | $error = ''; |
| 2098 | - if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
|
| 2598 | + if ($globalDebug) { |
|
| 2599 | + echo "Airspace from FlightAirMap website : Download..."; |
|
| 2600 | + } |
|
| 2099 | 2601 | if ($globalDBdriver == 'mysql') { |
| 2100 | 2602 | update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
| 2101 | 2603 | } else { |
@@ -2111,9 +2613,13 @@ discard block |
||
| 2111 | 2613 | update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
| 2112 | 2614 | } |
| 2113 | 2615 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2114 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2616 | + if ($globalDebug) { |
|
| 2617 | + echo "Gunzip..."; |
|
| 2618 | + } |
|
| 2115 | 2619 | update_db::gunzip($tmp_dir.'airspace.sql.gz'); |
| 2116 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2620 | + if ($globalDebug) { |
|
| 2621 | + echo "Add to DB..."; |
|
| 2622 | + } |
|
| 2117 | 2623 | $Connection = new Connection(); |
| 2118 | 2624 | if ($Connection->tableExists('airspace')) { |
| 2119 | 2625 | $query = 'DROP TABLE airspace'; |
@@ -2126,19 +2632,27 @@ discard block |
||
| 2126 | 2632 | } |
| 2127 | 2633 | $error = create_db::import_file($tmp_dir.'airspace.sql'); |
| 2128 | 2634 | update_db::insert_airspace_version($airspace_md5); |
| 2129 | - } else $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed."; |
|
| 2635 | + } else { |
|
| 2636 | + $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed."; |
|
| 2637 | + } |
|
| 2130 | 2638 | } |
| 2131 | - } else $error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed."; |
|
| 2639 | + } else { |
|
| 2640 | + $error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed."; |
|
| 2641 | + } |
|
| 2132 | 2642 | if ($error != '') { |
| 2133 | 2643 | return $error; |
| 2134 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2644 | + } elseif ($globalDebug) { |
|
| 2645 | + echo "Done\n"; |
|
| 2646 | + } |
|
| 2135 | 2647 | return ''; |
| 2136 | 2648 | } |
| 2137 | 2649 | |
| 2138 | 2650 | public static function update_geoid_fam() { |
| 2139 | 2651 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
| 2140 | 2652 | $error = ''; |
| 2141 | - if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
|
| 2653 | + if ($globalDebug) { |
|
| 2654 | + echo "Geoid from FlightAirMap website : Download..."; |
|
| 2655 | + } |
|
| 2142 | 2656 | update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
| 2143 | 2657 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
| 2144 | 2658 | $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
@@ -2146,36 +2660,54 @@ discard block |
||
| 2146 | 2660 | if (!update_db::check_geoid_version($geoid_md5)) { |
| 2147 | 2661 | update_db::download('http://data.flightairmap.fr/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
| 2148 | 2662 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
| 2149 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2663 | + if ($globalDebug) { |
|
| 2664 | + echo "Gunzip..."; |
|
| 2665 | + } |
|
| 2150 | 2666 | update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
| 2151 | 2667 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
| 2152 | 2668 | update_db::insert_geoid_version($geoid_md5); |
| 2153 | 2669 | } |
| 2154 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
| 2670 | + } else { |
|
| 2671 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
| 2672 | + } |
|
| 2155 | 2673 | } |
| 2156 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
| 2674 | + } else { |
|
| 2675 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
| 2676 | + } |
|
| 2157 | 2677 | if ($error != '') { |
| 2158 | 2678 | return $error; |
| 2159 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2679 | + } elseif ($globalDebug) { |
|
| 2680 | + echo "Done\n"; |
|
| 2681 | + } |
|
| 2160 | 2682 | return ''; |
| 2161 | 2683 | } |
| 2162 | 2684 | |
| 2163 | 2685 | public static function update_tle() { |
| 2164 | 2686 | global $tmp_dir, $globalDebug; |
| 2165 | - if ($globalDebug) echo "Download TLE : Download..."; |
|
| 2687 | + if ($globalDebug) { |
|
| 2688 | + echo "Download TLE : Download..."; |
|
| 2689 | + } |
|
| 2166 | 2690 | $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', |
| 2167 | 2691 | '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', |
| 2168 | 2692 | 'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt'); |
| 2169 | 2693 | foreach ($alltle as $filename) { |
| 2170 | - if ($globalDebug) echo "downloading ".$filename.'...'; |
|
| 2694 | + if ($globalDebug) { |
|
| 2695 | + echo "downloading ".$filename.'...'; |
|
| 2696 | + } |
|
| 2171 | 2697 | update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
| 2172 | 2698 | if (file_exists($tmp_dir.$filename)) { |
| 2173 | - if ($globalDebug) echo "Add to DB ".$filename."..."; |
|
| 2699 | + if ($globalDebug) { |
|
| 2700 | + echo "Add to DB ".$filename."..."; |
|
| 2701 | + } |
|
| 2174 | 2702 | $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
| 2175 | - } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
| 2703 | + } else { |
|
| 2704 | + $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
| 2705 | + } |
|
| 2176 | 2706 | if ($error != '') { |
| 2177 | 2707 | echo $error."\n"; |
| 2178 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2708 | + } elseif ($globalDebug) { |
|
| 2709 | + echo "Done\n"; |
|
| 2710 | + } |
|
| 2179 | 2711 | } |
| 2180 | 2712 | return ''; |
| 2181 | 2713 | } |
@@ -2183,10 +2715,14 @@ discard block |
||
| 2183 | 2715 | public static function update_models() { |
| 2184 | 2716 | global $tmp_dir, $globalDebug; |
| 2185 | 2717 | $error = ''; |
| 2186 | - if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
|
| 2718 | + if ($globalDebug) { |
|
| 2719 | + echo "Models from FlightAirMap website : Download..."; |
|
| 2720 | + } |
|
| 2187 | 2721 | update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
| 2188 | 2722 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2189 | - if ($globalDebug) echo "Check files...\n"; |
|
| 2723 | + if ($globalDebug) { |
|
| 2724 | + echo "Check files...\n"; |
|
| 2725 | + } |
|
| 2190 | 2726 | $newmodelsdb = array(); |
| 2191 | 2727 | if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
| 2192 | 2728 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2205,25 +2741,35 @@ discard block |
||
| 2205 | 2741 | } |
| 2206 | 2742 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2207 | 2743 | foreach ($diff as $key => $value) { |
| 2208 | - if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
|
| 2744 | + if ($globalDebug) { |
|
| 2745 | + echo 'Downloading model '.$key.' ...'."\n"; |
|
| 2746 | + } |
|
| 2209 | 2747 | update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
| 2210 | 2748 | |
| 2211 | 2749 | } |
| 2212 | 2750 | update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
| 2213 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 2751 | + } else { |
|
| 2752 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 2753 | + } |
|
| 2214 | 2754 | if ($error != '') { |
| 2215 | 2755 | return $error; |
| 2216 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2756 | + } elseif ($globalDebug) { |
|
| 2757 | + echo "Done\n"; |
|
| 2758 | + } |
|
| 2217 | 2759 | return ''; |
| 2218 | 2760 | } |
| 2219 | 2761 | |
| 2220 | 2762 | public static function update_space_models() { |
| 2221 | 2763 | global $tmp_dir, $globalDebug; |
| 2222 | 2764 | $error = ''; |
| 2223 | - if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
|
| 2765 | + if ($globalDebug) { |
|
| 2766 | + echo "Space models from FlightAirMap website : Download..."; |
|
| 2767 | + } |
|
| 2224 | 2768 | update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
| 2225 | 2769 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2226 | - if ($globalDebug) echo "Check files...\n"; |
|
| 2770 | + if ($globalDebug) { |
|
| 2771 | + echo "Check files...\n"; |
|
| 2772 | + } |
|
| 2227 | 2773 | $newmodelsdb = array(); |
| 2228 | 2774 | if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
| 2229 | 2775 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2242,25 +2788,35 @@ discard block |
||
| 2242 | 2788 | } |
| 2243 | 2789 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2244 | 2790 | foreach ($diff as $key => $value) { |
| 2245 | - if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
|
| 2791 | + if ($globalDebug) { |
|
| 2792 | + echo 'Downloading space model '.$key.' ...'."\n"; |
|
| 2793 | + } |
|
| 2246 | 2794 | update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
| 2247 | 2795 | |
| 2248 | 2796 | } |
| 2249 | 2797 | update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
| 2250 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 2798 | + } else { |
|
| 2799 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 2800 | + } |
|
| 2251 | 2801 | if ($error != '') { |
| 2252 | 2802 | return $error; |
| 2253 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2803 | + } elseif ($globalDebug) { |
|
| 2804 | + echo "Done\n"; |
|
| 2805 | + } |
|
| 2254 | 2806 | return ''; |
| 2255 | 2807 | } |
| 2256 | 2808 | |
| 2257 | 2809 | public static function update_vehicules_models() { |
| 2258 | 2810 | global $tmp_dir, $globalDebug; |
| 2259 | 2811 | $error = ''; |
| 2260 | - if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
|
| 2812 | + if ($globalDebug) { |
|
| 2813 | + echo "Vehicules models from FlightAirMap website : Download..."; |
|
| 2814 | + } |
|
| 2261 | 2815 | update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
| 2262 | 2816 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2263 | - if ($globalDebug) echo "Check files...\n"; |
|
| 2817 | + if ($globalDebug) { |
|
| 2818 | + echo "Check files...\n"; |
|
| 2819 | + } |
|
| 2264 | 2820 | $newmodelsdb = array(); |
| 2265 | 2821 | if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
| 2266 | 2822 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2279,15 +2835,21 @@ discard block |
||
| 2279 | 2835 | } |
| 2280 | 2836 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2281 | 2837 | foreach ($diff as $key => $value) { |
| 2282 | - if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
| 2838 | + if ($globalDebug) { |
|
| 2839 | + echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
| 2840 | + } |
|
| 2283 | 2841 | update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
| 2284 | 2842 | |
| 2285 | 2843 | } |
| 2286 | 2844 | update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
| 2287 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 2845 | + } else { |
|
| 2846 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 2847 | + } |
|
| 2288 | 2848 | if ($error != '') { |
| 2289 | 2849 | return $error; |
| 2290 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2850 | + } elseif ($globalDebug) { |
|
| 2851 | + echo "Done\n"; |
|
| 2852 | + } |
|
| 2291 | 2853 | return ''; |
| 2292 | 2854 | } |
| 2293 | 2855 | |
@@ -2330,7 +2892,9 @@ discard block |
||
| 2330 | 2892 | } |
| 2331 | 2893 | |
| 2332 | 2894 | $error = ''; |
| 2333 | - if ($globalDebug) echo "Notam : Download..."; |
|
| 2895 | + if ($globalDebug) { |
|
| 2896 | + echo "Notam : Download..."; |
|
| 2897 | + } |
|
| 2334 | 2898 | update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
| 2335 | 2899 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2336 | 2900 | $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
@@ -2345,14 +2909,30 @@ discard block |
||
| 2345 | 2909 | $data['fir'] = $q[0]; |
| 2346 | 2910 | $data['code'] = $q[1]; |
| 2347 | 2911 | $ifrvfr = $q[2]; |
| 2348 | - if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR'; |
|
| 2349 | - if ($ifrvfr == 'I') $data['rules'] = 'IFR'; |
|
| 2350 | - if ($ifrvfr == 'V') $data['rules'] = 'VFR'; |
|
| 2351 | - if ($q[4] == 'A') $data['scope'] = 'Airport warning'; |
|
| 2352 | - if ($q[4] == 'E') $data['scope'] = 'Enroute warning'; |
|
| 2353 | - if ($q[4] == 'W') $data['scope'] = 'Navigation warning'; |
|
| 2354 | - if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning'; |
|
| 2355 | - if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning'; |
|
| 2912 | + if ($ifrvfr == 'IV') { |
|
| 2913 | + $data['rules'] = 'IFR/VFR'; |
|
| 2914 | + } |
|
| 2915 | + if ($ifrvfr == 'I') { |
|
| 2916 | + $data['rules'] = 'IFR'; |
|
| 2917 | + } |
|
| 2918 | + if ($ifrvfr == 'V') { |
|
| 2919 | + $data['rules'] = 'VFR'; |
|
| 2920 | + } |
|
| 2921 | + if ($q[4] == 'A') { |
|
| 2922 | + $data['scope'] = 'Airport warning'; |
|
| 2923 | + } |
|
| 2924 | + if ($q[4] == 'E') { |
|
| 2925 | + $data['scope'] = 'Enroute warning'; |
|
| 2926 | + } |
|
| 2927 | + if ($q[4] == 'W') { |
|
| 2928 | + $data['scope'] = 'Navigation warning'; |
|
| 2929 | + } |
|
| 2930 | + if ($q[4] == 'AE') { |
|
| 2931 | + $data['scope'] = 'Airport/Enroute warning'; |
|
| 2932 | + } |
|
| 2933 | + if ($q[4] == 'AW') { |
|
| 2934 | + $data['scope'] = 'Airport/Navigation warning'; |
|
| 2935 | + } |
|
| 2356 | 2936 | //$data['scope'] = $q[4]; |
| 2357 | 2937 | $data['lower_limit'] = $q[5]; |
| 2358 | 2938 | $data['upper_limit'] = $q[6]; |
@@ -2360,8 +2940,12 @@ discard block |
||
| 2360 | 2940 | sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
| 2361 | 2941 | $latitude = $Common->convertDec($las,'latitude'); |
| 2362 | 2942 | $longitude = $Common->convertDec($lns,'longitude'); |
| 2363 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
| 2364 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
| 2943 | + if ($lac == 'S') { |
|
| 2944 | + $latitude = '-'.$latitude; |
|
| 2945 | + } |
|
| 2946 | + if ($lnc == 'W') { |
|
| 2947 | + $longitude = '-'.$longitude; |
|
| 2948 | + } |
|
| 2365 | 2949 | $data['center_latitude'] = $latitude; |
| 2366 | 2950 | $data['center_longitude'] = $longitude; |
| 2367 | 2951 | $data['radius'] = intval($radius); |
@@ -2391,10 +2975,14 @@ discard block |
||
| 2391 | 2975 | $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']); |
| 2392 | 2976 | unset($data); |
| 2393 | 2977 | } |
| 2394 | - } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
| 2978 | + } else { |
|
| 2979 | + $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
| 2980 | + } |
|
| 2395 | 2981 | if ($error != '') { |
| 2396 | 2982 | return $error; |
| 2397 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2983 | + } elseif ($globalDebug) { |
|
| 2984 | + echo "Done\n"; |
|
| 2985 | + } |
|
| 2398 | 2986 | return ''; |
| 2399 | 2987 | } |
| 2400 | 2988 | |
@@ -2419,7 +3007,9 @@ discard block |
||
| 2419 | 3007 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 2420 | 3008 | $airspace_json = json_decode($airspace_lst,true); |
| 2421 | 3009 | foreach ($airspace_json['records'] as $airspace) { |
| 2422 | - if ($globalDebug) echo $airspace['name']."...\n"; |
|
| 3010 | + if ($globalDebug) { |
|
| 3011 | + echo $airspace['name']."...\n"; |
|
| 3012 | + } |
|
| 2423 | 3013 | update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
| 2424 | 3014 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 2425 | 3015 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
@@ -2463,8 +3053,11 @@ discard block |
||
| 2463 | 3053 | return "error : ".$e->getMessage(); |
| 2464 | 3054 | } |
| 2465 | 3055 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2466 | - if ($row['nb'] > 0) return false; |
|
| 2467 | - else return true; |
|
| 3056 | + if ($row['nb'] > 0) { |
|
| 3057 | + return false; |
|
| 3058 | + } else { |
|
| 3059 | + return true; |
|
| 3060 | + } |
|
| 2468 | 3061 | } |
| 2469 | 3062 | |
| 2470 | 3063 | public static function insert_last_update() { |
@@ -2489,8 +3082,11 @@ discard block |
||
| 2489 | 3082 | return "error : ".$e->getMessage(); |
| 2490 | 3083 | } |
| 2491 | 3084 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2492 | - if ($row['nb'] > 0) return true; |
|
| 2493 | - else return false; |
|
| 3085 | + if ($row['nb'] > 0) { |
|
| 3086 | + return true; |
|
| 3087 | + } else { |
|
| 3088 | + return false; |
|
| 3089 | + } |
|
| 2494 | 3090 | } |
| 2495 | 3091 | |
| 2496 | 3092 | public static function check_geoid_version($version) { |
@@ -2503,8 +3099,11 @@ discard block |
||
| 2503 | 3099 | return "error : ".$e->getMessage(); |
| 2504 | 3100 | } |
| 2505 | 3101 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2506 | - if ($row['nb'] > 0) return true; |
|
| 2507 | - else return false; |
|
| 3102 | + if ($row['nb'] > 0) { |
|
| 3103 | + return true; |
|
| 3104 | + } else { |
|
| 3105 | + return false; |
|
| 3106 | + } |
|
| 2508 | 3107 | } |
| 2509 | 3108 | |
| 2510 | 3109 | public static function check_marine_identity_version($version) { |
@@ -2517,8 +3116,11 @@ discard block |
||
| 2517 | 3116 | return "error : ".$e->getMessage(); |
| 2518 | 3117 | } |
| 2519 | 3118 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2520 | - if ($row['nb'] > 0) return true; |
|
| 2521 | - else return false; |
|
| 3119 | + if ($row['nb'] > 0) { |
|
| 3120 | + return true; |
|
| 3121 | + } else { |
|
| 3122 | + return false; |
|
| 3123 | + } |
|
| 2522 | 3124 | } |
| 2523 | 3125 | |
| 2524 | 3126 | |
@@ -2573,8 +3175,11 @@ discard block |
||
| 2573 | 3175 | return "error : ".$e->getMessage(); |
| 2574 | 3176 | } |
| 2575 | 3177 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2576 | - if ($row['nb'] > 0) return false; |
|
| 2577 | - else return true; |
|
| 3178 | + if ($row['nb'] > 0) { |
|
| 3179 | + return false; |
|
| 3180 | + } else { |
|
| 3181 | + return true; |
|
| 3182 | + } |
|
| 2578 | 3183 | } |
| 2579 | 3184 | |
| 2580 | 3185 | public static function insert_last_notam_update() { |
@@ -2604,8 +3209,11 @@ discard block |
||
| 2604 | 3209 | return "error : ".$e->getMessage(); |
| 2605 | 3210 | } |
| 2606 | 3211 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2607 | - if ($row['nb'] > 0) return false; |
|
| 2608 | - else return true; |
|
| 3212 | + if ($row['nb'] > 0) { |
|
| 3213 | + return false; |
|
| 3214 | + } else { |
|
| 3215 | + return true; |
|
| 3216 | + } |
|
| 2609 | 3217 | } |
| 2610 | 3218 | |
| 2611 | 3219 | public static function insert_last_airspace_update() { |
@@ -2635,8 +3243,11 @@ discard block |
||
| 2635 | 3243 | return "error : ".$e->getMessage(); |
| 2636 | 3244 | } |
| 2637 | 3245 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2638 | - if ($row['nb'] > 0) return false; |
|
| 2639 | - else return true; |
|
| 3246 | + if ($row['nb'] > 0) { |
|
| 3247 | + return false; |
|
| 3248 | + } else { |
|
| 3249 | + return true; |
|
| 3250 | + } |
|
| 2640 | 3251 | } |
| 2641 | 3252 | |
| 2642 | 3253 | public static function insert_last_geoid_update() { |
@@ -2666,8 +3277,11 @@ discard block |
||
| 2666 | 3277 | return "error : ".$e->getMessage(); |
| 2667 | 3278 | } |
| 2668 | 3279 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2669 | - if ($row['nb'] > 0) return false; |
|
| 2670 | - else return true; |
|
| 3280 | + if ($row['nb'] > 0) { |
|
| 3281 | + return false; |
|
| 3282 | + } else { |
|
| 3283 | + return true; |
|
| 3284 | + } |
|
| 2671 | 3285 | } |
| 2672 | 3286 | |
| 2673 | 3287 | public static function insert_last_owner_update() { |
@@ -2696,8 +3310,11 @@ discard block |
||
| 2696 | 3310 | return "error : ".$e->getMessage(); |
| 2697 | 3311 | } |
| 2698 | 3312 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2699 | - if ($row['nb'] > 0) return false; |
|
| 2700 | - else return true; |
|
| 3313 | + if ($row['nb'] > 0) { |
|
| 3314 | + return false; |
|
| 3315 | + } else { |
|
| 3316 | + return true; |
|
| 3317 | + } |
|
| 2701 | 3318 | } |
| 2702 | 3319 | |
| 2703 | 3320 | public static function insert_last_schedules_update() { |
@@ -2726,8 +3343,11 @@ discard block |
||
| 2726 | 3343 | return "error : ".$e->getMessage(); |
| 2727 | 3344 | } |
| 2728 | 3345 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2729 | - if ($row['nb'] > 0) return false; |
|
| 2730 | - else return true; |
|
| 3346 | + if ($row['nb'] > 0) { |
|
| 3347 | + return false; |
|
| 3348 | + } else { |
|
| 3349 | + return true; |
|
| 3350 | + } |
|
| 2731 | 3351 | } |
| 2732 | 3352 | |
| 2733 | 3353 | public static function insert_last_tle_update() { |
@@ -2756,8 +3376,11 @@ discard block |
||
| 2756 | 3376 | return "error : ".$e->getMessage(); |
| 2757 | 3377 | } |
| 2758 | 3378 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2759 | - if ($row['nb'] > 0) return false; |
|
| 2760 | - else return true; |
|
| 3379 | + if ($row['nb'] > 0) { |
|
| 3380 | + return false; |
|
| 3381 | + } else { |
|
| 3382 | + return true; |
|
| 3383 | + } |
|
| 2761 | 3384 | } |
| 2762 | 3385 | |
| 2763 | 3386 | public static function insert_last_marine_identity_update() { |
@@ -9,7 +9,9 @@ discard block |
||
| 9 | 9 | if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { |
| 10 | 10 | exec("ps ux", $output, $result); |
| 11 | 11 | $j = 0; |
| 12 | - foreach ($output as $line) if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++; |
|
| 12 | + foreach ($output as $line) { |
|
| 13 | + if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++; |
|
| 14 | + } |
|
| 13 | 15 | if ($j > 1) { |
| 14 | 16 | echo "Script is already runnning..."; |
| 15 | 17 | die(); |
@@ -29,14 +31,18 @@ discard block |
||
| 29 | 31 | $update_db->update_notam(); |
| 30 | 32 | } |
| 31 | 33 | $update_db->insert_last_notam_update(); |
| 32 | - } elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n"; |
|
| 34 | + } elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) { |
|
| 35 | + echo "NOTAM are only updated once a day.\n"; |
|
| 36 | + } |
|
| 33 | 37 | if ($update_db->check_last_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
| 34 | 38 | $update_db->update_all(); |
| 35 | 39 | // require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 36 | 40 | // $Spotter = new Spotter(); |
| 37 | 41 | // $Spotter->updateFieldsFromOtherTables(); |
| 38 | 42 | $update_db->insert_last_update(); |
| 39 | - } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n"; |
|
| 43 | + } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) { |
|
| 44 | + echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n"; |
|
| 45 | + } |
|
| 40 | 46 | if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) { |
| 41 | 47 | echo "Check if new airspace version exist..."; |
| 42 | 48 | echo $update_db->update_airspace_fam(); |
@@ -45,8 +51,11 @@ discard block |
||
| 45 | 51 | if (isset($globalGeoid) && $globalGeoid && $update_db->check_last_geoid_update()) { |
| 46 | 52 | echo "Check if new geoid version exist..."; |
| 47 | 53 | $error = $update_db->update_geoid_fam(); |
| 48 | - if ($error == '') $update_db->insert_last_geoid_update(); |
|
| 49 | - else echo $error; |
|
| 54 | + if ($error == '') { |
|
| 55 | + $update_db->insert_last_geoid_update(); |
|
| 56 | + } else { |
|
| 57 | + echo $error; |
|
| 58 | + } |
|
| 50 | 59 | } |
| 51 | 60 | if (isset($globalMarine) && $globalMarine && $update_db->check_last_marine_identity_update()) { |
| 52 | 61 | echo "Check if new marine identity version exist..."; |
@@ -62,7 +71,9 @@ discard block |
||
| 62 | 71 | $update_db->delete_duplicateowner(); |
| 63 | 72 | } |
| 64 | 73 | $update_db->insert_last_owner_update(); |
| 65 | - } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n"; |
|
| 74 | + } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
|
| 75 | + echo "Owner are only updated every 15 days.\n"; |
|
| 76 | + } |
|
| 66 | 77 | |
| 67 | 78 | if (isset($globalAccidents) && $globalAccidents && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
| 68 | 79 | require_once(dirname(__FILE__).'/../require/class.Accident.php'); |
@@ -71,7 +82,9 @@ discard block |
||
| 71 | 82 | if ($Accident->check_last_accidents_update()) { |
| 72 | 83 | $Accident->download_update(); |
| 73 | 84 | $Accident->insert_last_accidents_update(); |
| 74 | - } else echo "Accidents are updated once a day.\n"; |
|
| 85 | + } else { |
|
| 86 | + echo "Accidents are updated once a day.\n"; |
|
| 87 | + } |
|
| 75 | 88 | } |
| 76 | 89 | |
| 77 | 90 | } |
@@ -84,15 +97,19 @@ discard block |
||
| 84 | 97 | if ($METAR->check_last_update()) { |
| 85 | 98 | $METAR->addMETARCycle(); |
| 86 | 99 | $METAR->insert_last_update(); |
| 87 | - } else echo "METAR are only updated every 30 minutes.\n"; |
|
| 88 | -} |
|
| 100 | + } else { |
|
| 101 | + echo "METAR are only updated every 30 minutes.\n"; |
|
| 102 | + } |
|
| 103 | + } |
|
| 89 | 104 | |
| 90 | 105 | if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
| 91 | 106 | echo "Updating schedules..."; |
| 92 | 107 | //$update_db->update_oneworld(); |
| 93 | 108 | $update_db->update_skyteam(); |
| 94 | 109 | $update_db->insert_last_schedules_update(); |
| 95 | -} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n"; |
|
| 110 | +} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
|
| 111 | + echo "Schedules are only updated every 15 days.\n"; |
|
| 112 | +} |
|
| 96 | 113 | |
| 97 | 114 | if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) { |
| 98 | 115 | echo "Updating statistics and archive old data..."; |
