Ysurac /
FlightAirMap
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | $ch = curl_init(); |
| 17 | 17 | curl_setopt($ch, CURLOPT_URL, $url); |
| 18 | 18 | if (isset($globalForceIPv4) && $globalForceIPv4) { |
| 19 | - if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){ |
|
| 19 | + if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) { |
|
| 20 | 20 | curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); |
| 21 | 21 | } |
| 22 | 22 | } |
@@ -34,20 +34,20 @@ discard block |
||
| 34 | 34 | fclose($fp); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - public static function gunzip($in_file,$out_file_name = '') { |
|
| 37 | + public static function gunzip($in_file, $out_file_name = '') { |
|
| 38 | 38 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 39 | 39 | $buffer_size = 4096; // read 4kb at a time |
| 40 | 40 | if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
| 41 | 41 | if ($in_file != '' && file_exists($in_file)) { |
| 42 | 42 | // PHP version of Ubuntu use gzopen64 instead of gzopen |
| 43 | - if (function_exists('gzopen')) $file = gzopen($in_file,'rb'); |
|
| 44 | - elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb'); |
|
| 43 | + if (function_exists('gzopen')) $file = gzopen($in_file, 'rb'); |
|
| 44 | + elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb'); |
|
| 45 | 45 | else { |
| 46 | 46 | echo 'gzopen not available'; |
| 47 | 47 | die; |
| 48 | 48 | } |
| 49 | 49 | $out_file = fopen($out_file_name, 'wb'); |
| 50 | - while(!gzeof($file)) { |
|
| 50 | + while (!gzeof($file)) { |
|
| 51 | 51 | fwrite($out_file, gzread($file, $buffer_size)); |
| 52 | 52 | } |
| 53 | 53 | fclose($out_file); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | try { |
| 72 | 72 | self::$db_sqlite = new PDO('sqlite:'.$database); |
| 73 | 73 | self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 74 | - } catch(PDOException $e) { |
|
| 74 | + } catch (PDOException $e) { |
|
| 75 | 75 | return "error : ".$e->getMessage(); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | //$Connection = new Connection(); |
| 87 | 87 | $sth = $Connection->db->prepare($query); |
| 88 | 88 | $sth->execute(array(':source' => $database_file)); |
| 89 | - } catch(PDOException $e) { |
|
| 89 | + } catch (PDOException $e) { |
|
| 90 | 90 | return "error : ".$e->getMessage(); |
| 91 | 91 | } |
| 92 | 92 | |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | try { |
| 98 | 98 | $sth = update_db::$db_sqlite->prepare($query); |
| 99 | 99 | $sth->execute(); |
| 100 | - } catch(PDOException $e) { |
|
| 100 | + } catch (PDOException $e) { |
|
| 101 | 101 | return "error : ".$e->getMessage(); |
| 102 | 102 | } |
| 103 | 103 | //$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)'; |
@@ -108,11 +108,11 @@ discard block |
||
| 108 | 108 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 109 | 109 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 110 | 110 | //$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); |
| 111 | - $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); |
|
| 111 | + $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); |
|
| 112 | 112 | $sth_dest->execute($query_dest_values); |
| 113 | 113 | } |
| 114 | 114 | if ($globalTransaction) $Connection->db->commit(); |
| 115 | - } catch(PDOException $e) { |
|
| 115 | + } catch (PDOException $e) { |
|
| 116 | 116 | if ($globalTransaction) $Connection->db->rollBack(); |
| 117 | 117 | return "error : ".$e->getMessage(); |
| 118 | 118 | } |
@@ -128,26 +128,26 @@ discard block |
||
| 128 | 128 | //$Connection = new Connection(); |
| 129 | 129 | $sth = $Connection->db->prepare($query); |
| 130 | 130 | $sth->execute(array(':source' => 'oneworld')); |
| 131 | - } catch(PDOException $e) { |
|
| 131 | + } catch (PDOException $e) { |
|
| 132 | 132 | return "error : ".$e->getMessage(); |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | if ($globalDebug) echo " - Add routes to DB -"; |
| 136 | 136 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 137 | 137 | $Spotter = new Spotter(); |
| 138 | - if ($fh = fopen($database_file,"r")) { |
|
| 138 | + if ($fh = fopen($database_file, "r")) { |
|
| 139 | 139 | $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)'; |
| 140 | 140 | $Connection = new Connection(); |
| 141 | 141 | $sth_dest = $Connection->db->prepare($query_dest); |
| 142 | 142 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 143 | 143 | while (!feof($fh)) { |
| 144 | - $line = fgetcsv($fh,9999,','); |
|
| 144 | + $line = fgetcsv($fh, 9999, ','); |
|
| 145 | 145 | if ($line[0] != '') { |
| 146 | 146 | if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) { |
| 147 | 147 | try { |
| 148 | - $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'); |
|
| 148 | + $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'); |
|
| 149 | 149 | $sth_dest->execute($query_dest_values); |
| 150 | - } catch(PDOException $e) { |
|
| 150 | + } catch (PDOException $e) { |
|
| 151 | 151 | if ($globalTransaction) $Connection->db->rollBack(); |
| 152 | 152 | return "error : ".$e->getMessage(); |
| 153 | 153 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | //$Connection = new Connection(); |
| 170 | 170 | $sth = $Connection->db->prepare($query); |
| 171 | 171 | $sth->execute(array(':source' => 'skyteam')); |
| 172 | - } catch(PDOException $e) { |
|
| 172 | + } catch (PDOException $e) { |
|
| 173 | 173 | return "error : ".$e->getMessage(); |
| 174 | 174 | } |
| 175 | 175 | |
@@ -177,24 +177,24 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 179 | 179 | $Spotter = new Spotter(); |
| 180 | - if ($fh = fopen($database_file,"r")) { |
|
| 180 | + if ($fh = fopen($database_file, "r")) { |
|
| 181 | 181 | $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)'; |
| 182 | 182 | $Connection = new Connection(); |
| 183 | 183 | $sth_dest = $Connection->db->prepare($query_dest); |
| 184 | 184 | try { |
| 185 | 185 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 186 | 186 | while (!feof($fh)) { |
| 187 | - $line = fgetcsv($fh,9999,','); |
|
| 187 | + $line = fgetcsv($fh, 9999, ','); |
|
| 188 | 188 | if ($line[0] != '') { |
| 189 | - $datebe = explode(' - ',$line[2]); |
|
| 189 | + $datebe = explode(' - ', $line[2]); |
|
| 190 | 190 | if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) { |
| 191 | - $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'); |
|
| 191 | + $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'); |
|
| 192 | 192 | $sth_dest->execute($query_dest_values); |
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | 196 | if ($globalTransaction) $Connection->db->commit(); |
| 197 | - } catch(PDOException $e) { |
|
| 197 | + } catch (PDOException $e) { |
|
| 198 | 198 | if ($globalTransaction) $Connection->db->rollBack(); |
| 199 | 199 | return "error : ".$e->getMessage(); |
| 200 | 200 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | $Connection = new Connection(); |
| 210 | 210 | $sth = $Connection->db->prepare($query); |
| 211 | 211 | $sth->execute(array(':source' => $database_file)); |
| 212 | - } catch(PDOException $e) { |
|
| 212 | + } catch (PDOException $e) { |
|
| 213 | 213 | return "error : ".$e->getMessage(); |
| 214 | 214 | } |
| 215 | 215 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | $Connection = new Connection(); |
| 218 | 218 | $sth = $Connection->db->prepare($query); |
| 219 | 219 | $sth->execute(array(':source' => $database_file)); |
| 220 | - } catch(PDOException $e) { |
|
| 220 | + } catch (PDOException $e) { |
|
| 221 | 221 | return "error : ".$e->getMessage(); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | try { |
| 227 | 227 | $sth = update_db::$db_sqlite->prepare($query); |
| 228 | 228 | $sth->execute(); |
| 229 | - } catch(PDOException $e) { |
|
| 229 | + } catch (PDOException $e) { |
|
| 230 | 230 | return "error : ".$e->getMessage(); |
| 231 | 231 | } |
| 232 | 232 | //$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)'; |
@@ -243,15 +243,15 @@ discard block |
||
| 243 | 243 | //$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']); |
| 244 | 244 | if ($values['UserString4'] == 'M') $type = 'military'; |
| 245 | 245 | else $type = null; |
| 246 | - $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
|
| 246 | + $query_dest_values = array(':LastModified' => $values['LastModified'], ':ModeS' => $values['ModeS'], ':ModeSCountry' => $values['ModeSCountry'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':type' => $type); |
|
| 247 | 247 | $sth_dest->execute($query_dest_values); |
| 248 | 248 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
| 249 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 249 | + $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']); |
|
| 250 | 250 | $sth_dest_owner->execute($query_dest_owner_values); |
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | if ($globalTransaction) $Connection->db->commit(); |
| 254 | - } catch(PDOException $e) { |
|
| 254 | + } catch (PDOException $e) { |
|
| 255 | 255 | return "error : ".$e->getMessage(); |
| 256 | 256 | } |
| 257 | 257 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | $Connection = new Connection(); |
| 262 | 262 | $sth = $Connection->db->prepare($query); |
| 263 | 263 | $sth->execute(array(':source' => $database_file)); |
| 264 | - } catch(PDOException $e) { |
|
| 264 | + } catch (PDOException $e) { |
|
| 265 | 265 | return "error : ".$e->getMessage(); |
| 266 | 266 | } |
| 267 | 267 | return ''; |
@@ -276,11 +276,11 @@ discard block |
||
| 276 | 276 | $Connection = new Connection(); |
| 277 | 277 | $sth = $Connection->db->prepare($query); |
| 278 | 278 | $sth->execute(array(':source' => $database_file)); |
| 279 | - } catch(PDOException $e) { |
|
| 279 | + } catch (PDOException $e) { |
|
| 280 | 280 | return "error : ".$e->getMessage(); |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - if ($fh = fopen($database_file,"r")) { |
|
| 283 | + if ($fh = fopen($database_file, "r")) { |
|
| 284 | 284 | //$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)'; |
| 285 | 285 | $query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 286 | 286 | |
@@ -290,13 +290,13 @@ discard block |
||
| 290 | 290 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 291 | 291 | while (!feof($fh)) { |
| 292 | 292 | $values = array(); |
| 293 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
| 293 | + $line = $Common->hex2str(fgets($fh, 9999)); |
|
| 294 | 294 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 295 | - $values['ModeS'] = substr($line,0,6); |
|
| 296 | - $values['Registration'] = trim(substr($line,69,6)); |
|
| 297 | - $aircraft_name = trim(substr($line,48,6)); |
|
| 295 | + $values['ModeS'] = substr($line, 0, 6); |
|
| 296 | + $values['Registration'] = trim(substr($line, 69, 6)); |
|
| 297 | + $aircraft_name = trim(substr($line, 48, 6)); |
|
| 298 | 298 | // Check if we can find ICAO, else set it to GLID |
| 299 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 299 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 300 | 300 | $search_more = ''; |
| 301 | 301 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 302 | 302 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -308,20 +308,20 @@ discard block |
||
| 308 | 308 | if (isset($result['icao']) && $result['icao'] != '') { |
| 309 | 309 | $values['ICAOTypeCode'] = $result['icao']; |
| 310 | 310 | } |
| 311 | - } catch(PDOException $e) { |
|
| 311 | + } catch (PDOException $e) { |
|
| 312 | 312 | return "error : ".$e->getMessage(); |
| 313 | 313 | } |
| 314 | 314 | if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 315 | 315 | // Add data to db |
| 316 | 316 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
| 317 | 317 | //$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']); |
| 318 | - $query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
| 318 | + $query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
| 319 | 319 | //print_r($query_dest_values); |
| 320 | 320 | $sth_dest->execute($query_dest_values); |
| 321 | 321 | } |
| 322 | 322 | } |
| 323 | 323 | if ($globalTransaction) $Connection->db->commit(); |
| 324 | - } catch(PDOException $e) { |
|
| 324 | + } catch (PDOException $e) { |
|
| 325 | 325 | return "error : ".$e->getMessage(); |
| 326 | 326 | } |
| 327 | 327 | } |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | $Connection = new Connection(); |
| 332 | 332 | $sth = $Connection->db->prepare($query); |
| 333 | 333 | $sth->execute(array(':source' => $database_file)); |
| 334 | - } catch(PDOException $e) { |
|
| 334 | + } catch (PDOException $e) { |
|
| 335 | 335 | return "error : ".$e->getMessage(); |
| 336 | 336 | } |
| 337 | 337 | return ''; |
@@ -345,11 +345,11 @@ discard block |
||
| 345 | 345 | $Connection = new Connection(); |
| 346 | 346 | $sth = $Connection->db->prepare($query); |
| 347 | 347 | $sth->execute(array(':source' => $database_file)); |
| 348 | - } catch(PDOException $e) { |
|
| 348 | + } catch (PDOException $e) { |
|
| 349 | 349 | return "error : ".$e->getMessage(); |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | - if ($fh = fopen($database_file,"r")) { |
|
| 352 | + if ($fh = fopen($database_file, "r")) { |
|
| 353 | 353 | //$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)'; |
| 354 | 354 | $query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 355 | 355 | |
@@ -357,9 +357,9 @@ discard block |
||
| 357 | 357 | $sth_dest = $Connection->db->prepare($query_dest); |
| 358 | 358 | try { |
| 359 | 359 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 360 | - $tmp = fgetcsv($fh,9999,',',"'"); |
|
| 360 | + $tmp = fgetcsv($fh, 9999, ',', "'"); |
|
| 361 | 361 | while (!feof($fh)) { |
| 362 | - $line = fgetcsv($fh,9999,',',"'"); |
|
| 362 | + $line = fgetcsv($fh, 9999, ',', "'"); |
|
| 363 | 363 | |
| 364 | 364 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 365 | 365 | //print_r($line); |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | $values['ICAOTypeCode'] = ''; |
| 369 | 369 | $aircraft_name = $line[2]; |
| 370 | 370 | // Check if we can find ICAO, else set it to GLID |
| 371 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 371 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 372 | 372 | $search_more = ''; |
| 373 | 373 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 374 | 374 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -377,20 +377,20 @@ discard block |
||
| 377 | 377 | $sth_search->execute(); |
| 378 | 378 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
| 379 | 379 | if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
| 380 | - } catch(PDOException $e) { |
|
| 380 | + } catch (PDOException $e) { |
|
| 381 | 381 | return "error : ".$e->getMessage(); |
| 382 | 382 | } |
| 383 | 383 | //if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 384 | 384 | // Add data to db |
| 385 | 385 | if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') { |
| 386 | 386 | //$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']); |
| 387 | - $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'); |
|
| 387 | + $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'); |
|
| 388 | 388 | //print_r($query_dest_values); |
| 389 | 389 | $sth_dest->execute($query_dest_values); |
| 390 | 390 | } |
| 391 | 391 | } |
| 392 | 392 | if ($globalTransaction) $Connection->db->commit(); |
| 393 | - } catch(PDOException $e) { |
|
| 393 | + } catch (PDOException $e) { |
|
| 394 | 394 | return "error : ".$e->getMessage(); |
| 395 | 395 | } |
| 396 | 396 | } |
@@ -400,13 +400,13 @@ discard block |
||
| 400 | 400 | $Connection = new Connection(); |
| 401 | 401 | $sth = $Connection->db->prepare($query); |
| 402 | 402 | $sth->execute(array(':source' => $database_file)); |
| 403 | - } catch(PDOException $e) { |
|
| 403 | + } catch (PDOException $e) { |
|
| 404 | 404 | return "error : ".$e->getMessage(); |
| 405 | 405 | } |
| 406 | 406 | return ''; |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | - public static function retrieve_owner($database_file,$country = 'F') { |
|
| 409 | + public static function retrieve_owner($database_file, $country = 'F') { |
|
| 410 | 410 | global $globalTransaction, $globalMasterSource; |
| 411 | 411 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
| 412 | 412 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;"; |
@@ -414,12 +414,12 @@ discard block |
||
| 414 | 414 | $Connection = new Connection(); |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | 416 | $sth->execute(array(':source' => $database_file)); |
| 417 | - } catch(PDOException $e) { |
|
| 417 | + } catch (PDOException $e) { |
|
| 418 | 418 | return "error : ".$e->getMessage(); |
| 419 | 419 | } |
| 420 | 420 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 421 | 421 | $Spotter = new Spotter(); |
| 422 | - if ($fh = fopen($database_file,"r")) { |
|
| 422 | + if ($fh = fopen($database_file, "r")) { |
|
| 423 | 423 | //$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)'; |
| 424 | 424 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 425 | 425 | $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
@@ -429,9 +429,9 @@ discard block |
||
| 429 | 429 | $sth_modes = $Connection->db->prepare($query_modes); |
| 430 | 430 | try { |
| 431 | 431 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 432 | - $tmp = fgetcsv($fh,9999,',','"'); |
|
| 432 | + $tmp = fgetcsv($fh, 9999, ',', '"'); |
|
| 433 | 433 | while (!feof($fh)) { |
| 434 | - $line = fgetcsv($fh,9999,',','"'); |
|
| 434 | + $line = fgetcsv($fh, 9999, ',', '"'); |
|
| 435 | 435 | $values = array(); |
| 436 | 436 | //print_r($line); |
| 437 | 437 | if ($country == 'F') { |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | $values['base'] = $line[4]; |
| 440 | 440 | $values['owner'] = $line[5]; |
| 441 | 441 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 442 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 442 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 443 | 443 | $values['cancel'] = $line[7]; |
| 444 | 444 | } elseif ($country == 'EI') { |
| 445 | 445 | // TODO : add modeS & reg to aircraft_modes |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | $values['base'] = $line[3]; |
| 448 | 448 | $values['owner'] = $line[2]; |
| 449 | 449 | if ($line[1] == '') $values['date_first_reg'] = null; |
| 450 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 450 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1])); |
|
| 451 | 451 | $values['cancel'] = ''; |
| 452 | 452 | $values['modes'] = $line[7]; |
| 453 | 453 | $values['icao'] = $line[8]; |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | $values['base'] = null; |
| 468 | 468 | $values['owner'] = $line[5]; |
| 469 | 469 | if ($line[18] == '') $values['date_first_reg'] = null; |
| 470 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 470 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18])); |
|
| 471 | 471 | $values['cancel'] = ''; |
| 472 | 472 | } elseif ($country == 'VH') { |
| 473 | 473 | // TODO : add modeS & reg to aircraft_modes |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | $values['base'] = null; |
| 476 | 476 | $values['owner'] = $line[12]; |
| 477 | 477 | if ($line[28] == '') $values['date_first_reg'] = null; |
| 478 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 478 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28])); |
|
| 479 | 479 | |
| 480 | 480 | $values['cancel'] = $line[39]; |
| 481 | 481 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -495,28 +495,28 @@ discard block |
||
| 495 | 495 | $values['base'] = null; |
| 496 | 496 | $values['owner'] = $line[8]; |
| 497 | 497 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 498 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 498 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 499 | 499 | $values['cancel'] = ''; |
| 500 | 500 | } elseif ($country == 'PP') { |
| 501 | 501 | $values['registration'] = $line[0]; |
| 502 | 502 | $values['base'] = null; |
| 503 | 503 | $values['owner'] = $line[4]; |
| 504 | 504 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 505 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 505 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 506 | 506 | $values['cancel'] = $line[7]; |
| 507 | 507 | } elseif ($country == 'E7') { |
| 508 | 508 | $values['registration'] = $line[0]; |
| 509 | 509 | $values['base'] = null; |
| 510 | 510 | $values['owner'] = $line[4]; |
| 511 | 511 | if ($line[5] == '') $values['date_first_reg'] = null; |
| 512 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 512 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 513 | 513 | $values['cancel'] = ''; |
| 514 | 514 | } elseif ($country == '8Q') { |
| 515 | 515 | $values['registration'] = $line[0]; |
| 516 | 516 | $values['base'] = null; |
| 517 | 517 | $values['owner'] = $line[3]; |
| 518 | 518 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 519 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 519 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 520 | 520 | $values['cancel'] = ''; |
| 521 | 521 | } elseif ($country == 'ZK') { |
| 522 | 522 | $values['registration'] = $line[0]; |
@@ -530,18 +530,18 @@ discard block |
||
| 530 | 530 | $values['registration'] = $line[0]; |
| 531 | 531 | $values['base'] = null; |
| 532 | 532 | $values['owner'] = $line[6]; |
| 533 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 534 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 533 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 534 | + $values['cancel'] = date("Y-m-d", strtotime($line[8])); |
|
| 535 | 535 | $values['modes'] = $line[4]; |
| 536 | 536 | $values['icao'] = $line[10]; |
| 537 | 537 | } elseif ($country == 'OY') { |
| 538 | 538 | $values['registration'] = $line[0]; |
| 539 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 539 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[4])); |
|
| 540 | 540 | $values['modes'] = $line[5]; |
| 541 | 541 | $values['icao'] = $line[6]; |
| 542 | 542 | } elseif ($country == 'PH') { |
| 543 | 543 | $values['registration'] = $line[0]; |
| 544 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 544 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[3])); |
|
| 545 | 545 | $values['modes'] = $line[4]; |
| 546 | 546 | $values['icao'] = $line[5]; |
| 547 | 547 | } elseif ($country == 'OM' || $country == 'TF') { |
@@ -552,17 +552,17 @@ discard block |
||
| 552 | 552 | $values['cancel'] = ''; |
| 553 | 553 | } |
| 554 | 554 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
| 555 | - $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
|
| 555 | + $query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file); |
|
| 556 | 556 | $sth_dest->execute($query_dest_values); |
| 557 | 557 | } |
| 558 | 558 | if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') { |
| 559 | 559 | $modescountry = $Spotter->countryFromAircraftRegistration($values['registration']); |
| 560 | - $query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file); |
|
| 560 | + $query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file); |
|
| 561 | 561 | $sth_modes->execute($query_modes_values); |
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | 564 | if ($globalTransaction) $Connection->db->commit(); |
| 565 | - } catch(PDOException $e) { |
|
| 565 | + } catch (PDOException $e) { |
|
| 566 | 566 | return "error : ".$e->getMessage(); |
| 567 | 567 | } |
| 568 | 568 | } |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 701 | 701 | |
| 702 | 702 | $i = 0; |
| 703 | - while($row = sparql_fetch_array($result)) |
|
| 703 | + while ($row = sparql_fetch_array($result)) |
|
| 704 | 704 | { |
| 705 | 705 | if ($i >= 1) { |
| 706 | 706 | //print_r($row); |
@@ -720,33 +720,33 @@ discard block |
||
| 720 | 720 | $row['image'] = ''; |
| 721 | 721 | $row['image_thumb'] = ''; |
| 722 | 722 | } else { |
| 723 | - $image = str_replace(' ','_',$row['image']); |
|
| 723 | + $image = str_replace(' ', '_', $row['image']); |
|
| 724 | 724 | $digest = md5($image); |
| 725 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image; |
|
| 726 | - $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder; |
|
| 727 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image; |
|
| 728 | - $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder; |
|
| 725 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image; |
|
| 726 | + $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder; |
|
| 727 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image; |
|
| 728 | + $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder; |
|
| 729 | 729 | } |
| 730 | 730 | |
| 731 | - $country = explode('-',$row['country']); |
|
| 731 | + $country = explode('-', $row['country']); |
|
| 732 | 732 | $row['country'] = $country[0]; |
| 733 | 733 | |
| 734 | 734 | $row['type'] = trim($row['type']); |
| 735 | - 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'])) { |
|
| 735 | + 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'])) { |
|
| 736 | 736 | $row['type'] = 'military'; |
| 737 | 737 | } 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') { |
| 738 | 738 | $row['type'] = 'small_airport'; |
| 739 | 739 | } |
| 740 | 740 | |
| 741 | - $row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city']))); |
|
| 742 | - $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']); |
|
| 741 | + $row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city']))); |
|
| 742 | + $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']); |
|
| 743 | 743 | //print_r($query_dest_values); |
| 744 | 744 | |
| 745 | 745 | if ($row['icao'] != '') { |
| 746 | 746 | try { |
| 747 | 747 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao'); |
| 748 | 748 | $sth->execute(array(':icao' => $row['icao'])); |
| 749 | - } catch(PDOException $e) { |
|
| 749 | + } catch (PDOException $e) { |
|
| 750 | 750 | return "error : ".$e->getMessage(); |
| 751 | 751 | } |
| 752 | 752 | if ($sth->fetchColumn() > 0) { |
@@ -754,15 +754,15 @@ discard block |
||
| 754 | 754 | $query = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 755 | 755 | try { |
| 756 | 756 | $sth = $Connection->db->prepare($query); |
| 757 | - $sth->execute(array(':icao' => $row['icao'],':type' => $row['type'])); |
|
| 758 | - } catch(PDOException $e) { |
|
| 757 | + $sth->execute(array(':icao' => $row['icao'], ':type' => $row['type'])); |
|
| 758 | + } catch (PDOException $e) { |
|
| 759 | 759 | return "error : ".$e->getMessage(); |
| 760 | 760 | } |
| 761 | 761 | echo $row['icao'].' : '.$row['type']."\n"; |
| 762 | 762 | } else { |
| 763 | 763 | try { |
| 764 | 764 | $sth_dest->execute($query_dest_values); |
| 765 | - } catch(PDOException $e) { |
|
| 765 | + } catch (PDOException $e) { |
|
| 766 | 766 | return "error : ".$e->getMessage(); |
| 767 | 767 | } |
| 768 | 768 | } |
@@ -813,7 +813,7 @@ discard block |
||
| 813 | 813 | echo "Download data from ourairports.com...\n"; |
| 814 | 814 | $delimiter = ','; |
| 815 | 815 | $out_file = $tmp_dir.'airports.csv'; |
| 816 | - update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
|
| 816 | + update_db::download('http://ourairports.com/data/airports.csv', $out_file); |
|
| 817 | 817 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 818 | 818 | echo "Add data from ourairports.com...\n"; |
| 819 | 819 | |
@@ -824,33 +824,33 @@ discard block |
||
| 824 | 824 | //$Connection->db->beginTransaction(); |
| 825 | 825 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 826 | 826 | { |
| 827 | - if(!$header) $header = $row; |
|
| 827 | + if (!$header) $header = $row; |
|
| 828 | 828 | else { |
| 829 | 829 | $data = array(); |
| 830 | 830 | $data = array_combine($header, $row); |
| 831 | 831 | try { |
| 832 | 832 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao'); |
| 833 | 833 | $sth->execute(array(':icao' => $data['ident'])); |
| 834 | - } catch(PDOException $e) { |
|
| 834 | + } catch (PDOException $e) { |
|
| 835 | 835 | return "error : ".$e->getMessage(); |
| 836 | 836 | } |
| 837 | 837 | if ($sth->fetchColumn() > 0) { |
| 838 | 838 | $query = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 839 | 839 | try { |
| 840 | 840 | $sth = $Connection->db->prepare($query); |
| 841 | - $sth->execute(array(':icao' => $data['ident'],':type' => $data['type'])); |
|
| 842 | - } catch(PDOException $e) { |
|
| 841 | + $sth->execute(array(':icao' => $data['ident'], ':type' => $data['type'])); |
|
| 842 | + } catch (PDOException $e) { |
|
| 843 | 843 | return "error : ".$e->getMessage(); |
| 844 | 844 | } |
| 845 | 845 | } else { |
| 846 | 846 | if ($data['gps_code'] == $data['ident']) { |
| 847 | 847 | $query = "INSERT INTO airport (name,city,country,iata,icao,latitude,longitude,altitude,type,home_link,wikipedia_link) |
| 848 | 848 | VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)"; |
| 849 | - $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']); |
|
| 849 | + $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']); |
|
| 850 | 850 | try { |
| 851 | 851 | $sth = $Connection->db->prepare($query); |
| 852 | 852 | $sth->execute($query_values); |
| 853 | - } catch(PDOException $e) { |
|
| 853 | + } catch (PDOException $e) { |
|
| 854 | 854 | return "error : ".$e->getMessage(); |
| 855 | 855 | } |
| 856 | 856 | $i++; |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | |
| 866 | 866 | echo "Download data from another free database...\n"; |
| 867 | 867 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
| 868 | - update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
|
| 868 | + update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file); |
|
| 869 | 869 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 870 | 870 | update_db::unzip($out_file); |
| 871 | 871 | $header = NULL; |
@@ -877,15 +877,15 @@ discard block |
||
| 877 | 877 | //$Connection->db->beginTransaction(); |
| 878 | 878 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 879 | 879 | { |
| 880 | - if(!$header) $header = $row; |
|
| 880 | + if (!$header) $header = $row; |
|
| 881 | 881 | else { |
| 882 | 882 | $data = $row; |
| 883 | 883 | |
| 884 | 884 | $query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao'; |
| 885 | 885 | try { |
| 886 | 886 | $sth = $Connection->db->prepare($query); |
| 887 | - $sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4])))); |
|
| 888 | - } catch(PDOException $e) { |
|
| 887 | + $sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4])))); |
|
| 888 | + } catch (PDOException $e) { |
|
| 889 | 889 | return "error : ".$e->getMessage(); |
| 890 | 890 | } |
| 891 | 891 | } |
@@ -899,15 +899,15 @@ discard block |
||
| 899 | 899 | try { |
| 900 | 900 | $sth = $Connection->db->prepare("SELECT icao FROM airport WHERE name LIKE '%Air Base%'"); |
| 901 | 901 | $sth->execute(); |
| 902 | - } catch(PDOException $e) { |
|
| 902 | + } catch (PDOException $e) { |
|
| 903 | 903 | return "error : ".$e->getMessage(); |
| 904 | 904 | } |
| 905 | 905 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 906 | 906 | $query2 = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 907 | 907 | try { |
| 908 | 908 | $sth2 = $Connection->db->prepare($query2); |
| 909 | - $sth2->execute(array(':icao' => $row['icao'],':type' => 'military')); |
|
| 910 | - } catch(PDOException $e) { |
|
| 909 | + $sth2->execute(array(':icao' => $row['icao'], ':type' => 'military')); |
|
| 910 | + } catch (PDOException $e) { |
|
| 911 | 911 | return "error : ".$e->getMessage(); |
| 912 | 912 | } |
| 913 | 913 | } |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | $Connection = new Connection(); |
| 929 | 929 | $sth = $Connection->db->prepare($query); |
| 930 | 930 | $sth->execute(array(':source' => 'translation.csv')); |
| 931 | - } catch(PDOException $e) { |
|
| 931 | + } catch (PDOException $e) { |
|
| 932 | 932 | return "error : ".$e->getMessage(); |
| 933 | 933 | } |
| 934 | 934 | |
@@ -945,7 +945,7 @@ discard block |
||
| 945 | 945 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 946 | 946 | { |
| 947 | 947 | $i++; |
| 948 | - if($i > 12) { |
|
| 948 | + if ($i > 12) { |
|
| 949 | 949 | $data = $row; |
| 950 | 950 | $operator = $data[2]; |
| 951 | 951 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | //echo substr($operator, 0, 2)."\n";; |
| 954 | 954 | if (count($airline_array) > 0) { |
| 955 | 955 | //print_r($airline_array); |
| 956 | - $operator = $airline_array[0]['icao'].substr($operator,2); |
|
| 956 | + $operator = $airline_array[0]['icao'].substr($operator, 2); |
|
| 957 | 957 | } |
| 958 | 958 | } |
| 959 | 959 | |
@@ -961,14 +961,14 @@ discard block |
||
| 961 | 961 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
| 962 | 962 | $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
| 963 | 963 | if (count($airline_array) > 0) { |
| 964 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 964 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2); |
|
| 965 | 965 | } |
| 966 | 966 | } |
| 967 | 967 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 968 | 968 | try { |
| 969 | 969 | $sth = $Connection->db->prepare($query); |
| 970 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 971 | - } catch(PDOException $e) { |
|
| 970 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 971 | + } catch (PDOException $e) { |
|
| 972 | 972 | return "error : ".$e->getMessage(); |
| 973 | 973 | } |
| 974 | 974 | } |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | $Connection = new Connection(); |
| 987 | 987 | $sth = $Connection->db->prepare($query); |
| 988 | 988 | $sth->execute(array(':source' => 'website_fam')); |
| 989 | - } catch(PDOException $e) { |
|
| 989 | + } catch (PDOException $e) { |
|
| 990 | 990 | return "error : ".$e->getMessage(); |
| 991 | 991 | } |
| 992 | 992 | //update_db::unzip($out_file); |
@@ -1004,8 +1004,8 @@ discard block |
||
| 1004 | 1004 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 1005 | 1005 | try { |
| 1006 | 1006 | $sth = $Connection->db->prepare($query); |
| 1007 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 1008 | - } catch(PDOException $e) { |
|
| 1007 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 1008 | + } catch (PDOException $e) { |
|
| 1009 | 1009 | return "error : ".$e->getMessage(); |
| 1010 | 1010 | } |
| 1011 | 1011 | } |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | $Connection = new Connection(); |
| 1029 | 1029 | $sth = $Connection->db->prepare($query); |
| 1030 | 1030 | $sth->execute(array(':source' => 'website_faa')); |
| 1031 | - } catch(PDOException $e) { |
|
| 1031 | + } catch (PDOException $e) { |
|
| 1032 | 1032 | return "error : ".$e->getMessage(); |
| 1033 | 1033 | } |
| 1034 | 1034 | |
@@ -1037,7 +1037,7 @@ discard block |
||
| 1037 | 1037 | $Connection = new Connection(); |
| 1038 | 1038 | $sth = $Connection->db->prepare($query); |
| 1039 | 1039 | $sth->execute(array(':source' => 'website_faa')); |
| 1040 | - } catch(PDOException $e) { |
|
| 1040 | + } catch (PDOException $e) { |
|
| 1041 | 1041 | return "error : ".$e->getMessage(); |
| 1042 | 1042 | } |
| 1043 | 1043 | |
@@ -1054,8 +1054,8 @@ discard block |
||
| 1054 | 1054 | $query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1'; |
| 1055 | 1055 | try { |
| 1056 | 1056 | $sths = $Connection->db->prepare($query_search); |
| 1057 | - $sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa')); |
|
| 1058 | - } catch(PDOException $e) { |
|
| 1057 | + $sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa')); |
|
| 1058 | + } catch (PDOException $e) { |
|
| 1059 | 1059 | return "error s : ".$e->getMessage(); |
| 1060 | 1060 | } |
| 1061 | 1061 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
@@ -1068,8 +1068,8 @@ discard block |
||
| 1068 | 1068 | //} |
| 1069 | 1069 | try { |
| 1070 | 1070 | $sthi = $Connection->db->prepare($queryi); |
| 1071 | - $sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode'])); |
|
| 1072 | - } catch(PDOException $e) { |
|
| 1071 | + $sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode'])); |
|
| 1072 | + } catch (PDOException $e) { |
|
| 1073 | 1073 | return "error u : ".$e->getMessage(); |
| 1074 | 1074 | } |
| 1075 | 1075 | } else { |
@@ -1077,7 +1077,7 @@ discard block |
||
| 1077 | 1077 | try { |
| 1078 | 1078 | $sthsm = $Connection->db->prepare($query_search_mfr); |
| 1079 | 1079 | $sthsm->execute(array(':mfr' => $data[2])); |
| 1080 | - } catch(PDOException $e) { |
|
| 1080 | + } catch (PDOException $e) { |
|
| 1081 | 1081 | return "error mfr : ".$e->getMessage(); |
| 1082 | 1082 | } |
| 1083 | 1083 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
@@ -1087,8 +1087,8 @@ discard block |
||
| 1087 | 1087 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
| 1088 | 1088 | try { |
| 1089 | 1089 | $sthf = $Connection->db->prepare($queryf); |
| 1090 | - $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')); |
|
| 1091 | - } catch(PDOException $e) { |
|
| 1090 | + $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')); |
|
| 1091 | + } catch (PDOException $e) { |
|
| 1092 | 1092 | return "error f : ".$e->getMessage(); |
| 1093 | 1093 | } |
| 1094 | 1094 | } |
@@ -1098,13 +1098,13 @@ discard block |
||
| 1098 | 1098 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 1099 | 1099 | try { |
| 1100 | 1100 | $sth = $Connection->db->prepare($query); |
| 1101 | - $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')); |
|
| 1102 | - } catch(PDOException $e) { |
|
| 1101 | + $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')); |
|
| 1102 | + } catch (PDOException $e) { |
|
| 1103 | 1103 | return "error i : ".$e->getMessage(); |
| 1104 | 1104 | } |
| 1105 | 1105 | } |
| 1106 | 1106 | } |
| 1107 | - if ($i % 90 == 0) { |
|
| 1107 | + if ($i%90 == 0) { |
|
| 1108 | 1108 | if ($globalTransaction) $Connection->db->commit(); |
| 1109 | 1109 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1110 | 1110 | } |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | $Connection = new Connection(); |
| 1124 | 1124 | $sth = $Connection->db->prepare($query); |
| 1125 | 1125 | $sth->execute(array(':source' => 'website_fam')); |
| 1126 | - } catch(PDOException $e) { |
|
| 1126 | + } catch (PDOException $e) { |
|
| 1127 | 1127 | return "error : ".$e->getMessage(); |
| 1128 | 1128 | } |
| 1129 | 1129 | $delimiter = "\t"; |
@@ -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 | } |
@@ -1172,7 +1172,7 @@ discard block |
||
| 1172 | 1172 | try { |
| 1173 | 1173 | $sth = $Connection->db->prepare($query); |
| 1174 | 1174 | $sth->execute(); |
| 1175 | - } catch(PDOException $e) { |
|
| 1175 | + } catch (PDOException $e) { |
|
| 1176 | 1176 | return "error : ".$e->getMessage(); |
| 1177 | 1177 | } |
| 1178 | 1178 | $delimiter = "\t"; |
@@ -1187,8 +1187,8 @@ discard block |
||
| 1187 | 1187 | $query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)'; |
| 1188 | 1188 | try { |
| 1189 | 1189 | $sth = $Connection->db->prepare($query); |
| 1190 | - $sth->execute(array(':name' => $data[0],':alias' => $data[1],':iata' => $data[2],':icao' => $data[3], ':callsign' => $data[4],':country' => $data[5],':active' => $data[6],':type' => $data[7],':home' => $data[8],':wikipedia_link' => $data[9],':alliance' => $data[10],':ban_eu' => $data[11])); |
|
| 1191 | - } catch(PDOException $e) { |
|
| 1190 | + $sth->execute(array(':name' => $data[0], ':alias' => $data[1], ':iata' => $data[2], ':icao' => $data[3], ':callsign' => $data[4], ':country' => $data[5], ':active' => $data[6], ':type' => $data[7], ':home' => $data[8], ':wikipedia_link' => $data[9], ':alliance' => $data[10], ':ban_eu' => $data[11])); |
|
| 1191 | + } catch (PDOException $e) { |
|
| 1192 | 1192 | return "error : ".$e->getMessage(); |
| 1193 | 1193 | } |
| 1194 | 1194 | } |
@@ -1216,7 +1216,7 @@ discard block |
||
| 1216 | 1216 | $Connection = new Connection(); |
| 1217 | 1217 | $sth = $Connection->db->prepare($query); |
| 1218 | 1218 | $sth->execute(array(':source' => 'website_fam')); |
| 1219 | - } catch(PDOException $e) { |
|
| 1219 | + } catch (PDOException $e) { |
|
| 1220 | 1220 | return "error : ".$e->getMessage(); |
| 1221 | 1221 | } |
| 1222 | 1222 | |
@@ -1232,8 +1232,8 @@ discard block |
||
| 1232 | 1232 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)'; |
| 1233 | 1233 | try { |
| 1234 | 1234 | $sth = $Connection->db->prepare($query); |
| 1235 | - $sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1236 | - } catch(PDOException $e) { |
|
| 1235 | + $sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1236 | + } catch (PDOException $e) { |
|
| 1237 | 1237 | //print_r($data); |
| 1238 | 1238 | return "error : ".$e->getMessage(); |
| 1239 | 1239 | } |
@@ -1253,7 +1253,7 @@ discard block |
||
| 1253 | 1253 | $Connection = new Connection(); |
| 1254 | 1254 | $sth = $Connection->db->prepare($query); |
| 1255 | 1255 | $sth->execute(array(':source' => 'website_fam')); |
| 1256 | - } catch(PDOException $e) { |
|
| 1256 | + } catch (PDOException $e) { |
|
| 1257 | 1257 | return "error : ".$e->getMessage(); |
| 1258 | 1258 | } |
| 1259 | 1259 | $delimiter = "\t"; |
@@ -1268,9 +1268,9 @@ discard block |
||
| 1268 | 1268 | $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)'; |
| 1269 | 1269 | try { |
| 1270 | 1270 | $sth = $Connection->db->prepare($query); |
| 1271 | - $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')); |
|
| 1272 | - } catch(PDOException $e) { |
|
| 1273 | - if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
| 1271 | + $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')); |
|
| 1272 | + } catch (PDOException $e) { |
|
| 1273 | + if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',', $data); |
|
| 1274 | 1274 | } |
| 1275 | 1275 | } |
| 1276 | 1276 | $i++; |
@@ -1288,7 +1288,7 @@ discard block |
||
| 1288 | 1288 | $Connection = new Connection(); |
| 1289 | 1289 | $sth = $Connection->db->prepare($query); |
| 1290 | 1290 | $sth->execute(); |
| 1291 | - } catch(PDOException $e) { |
|
| 1291 | + } catch (PDOException $e) { |
|
| 1292 | 1292 | return "error : ".$e->getMessage(); |
| 1293 | 1293 | } |
| 1294 | 1294 | |
@@ -1309,8 +1309,8 @@ discard block |
||
| 1309 | 1309 | $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)'; |
| 1310 | 1310 | try { |
| 1311 | 1311 | $sth = $Connection->db->prepare($query); |
| 1312 | - $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])); |
|
| 1313 | - } catch(PDOException $e) { |
|
| 1312 | + $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])); |
|
| 1313 | + } catch (PDOException $e) { |
|
| 1314 | 1314 | return "error : ".$e->getMessage(); |
| 1315 | 1315 | } |
| 1316 | 1316 | } |
@@ -1329,7 +1329,7 @@ discard block |
||
| 1329 | 1329 | $Connection = new Connection(); |
| 1330 | 1330 | $sth = $Connection->db->prepare($query); |
| 1331 | 1331 | $sth->execute(); |
| 1332 | - } catch(PDOException $e) { |
|
| 1332 | + } catch (PDOException $e) { |
|
| 1333 | 1333 | return "error : ".$e->getMessage(); |
| 1334 | 1334 | } |
| 1335 | 1335 | $delimiter = "\t"; |
@@ -1346,8 +1346,8 @@ discard block |
||
| 1346 | 1346 | VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)'; |
| 1347 | 1347 | try { |
| 1348 | 1348 | $sth = $Connection->db->prepare($query); |
| 1349 | - $sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21],':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29])); |
|
| 1350 | - } catch(PDOException $e) { |
|
| 1349 | + $sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21], ':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29])); |
|
| 1350 | + } catch (PDOException $e) { |
|
| 1351 | 1351 | return "error : ".$e->getMessage(); |
| 1352 | 1352 | } |
| 1353 | 1353 | } |
@@ -1366,7 +1366,7 @@ discard block |
||
| 1366 | 1366 | $Connection = new Connection(); |
| 1367 | 1367 | $sth = $Connection->db->prepare($query); |
| 1368 | 1368 | $sth->execute(); |
| 1369 | - } catch(PDOException $e) { |
|
| 1369 | + } catch (PDOException $e) { |
|
| 1370 | 1370 | return "error : ".$e->getMessage(); |
| 1371 | 1371 | } |
| 1372 | 1372 | |
@@ -1382,7 +1382,7 @@ discard block |
||
| 1382 | 1382 | try { |
| 1383 | 1383 | $sth = $Connection->db->prepare($query); |
| 1384 | 1384 | $sth->execute(array(':icao' => $icao)); |
| 1385 | - } catch(PDOException $e) { |
|
| 1385 | + } catch (PDOException $e) { |
|
| 1386 | 1386 | return "error : ".$e->getMessage(); |
| 1387 | 1387 | } |
| 1388 | 1388 | } |
@@ -1393,7 +1393,7 @@ discard block |
||
| 1393 | 1393 | return ''; |
| 1394 | 1394 | } |
| 1395 | 1395 | |
| 1396 | - public static function tle($filename,$tletype) { |
|
| 1396 | + public static function tle($filename, $tletype) { |
|
| 1397 | 1397 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1398 | 1398 | global $tmp_dir, $globalTransaction; |
| 1399 | 1399 | //$Spotter = new Spotter(); |
@@ -1403,7 +1403,7 @@ discard block |
||
| 1403 | 1403 | $Connection = new Connection(); |
| 1404 | 1404 | $sth = $Connection->db->prepare($query); |
| 1405 | 1405 | $sth->execute(array(':source' => $filename)); |
| 1406 | - } catch(PDOException $e) { |
|
| 1406 | + } catch (PDOException $e) { |
|
| 1407 | 1407 | return "error : ".$e->getMessage(); |
| 1408 | 1408 | } |
| 1409 | 1409 | |
@@ -1428,8 +1428,8 @@ discard block |
||
| 1428 | 1428 | $query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)'; |
| 1429 | 1429 | try { |
| 1430 | 1430 | $sth = $Connection->db->prepare($query); |
| 1431 | - $sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename)); |
|
| 1432 | - } catch(PDOException $e) { |
|
| 1431 | + $sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename)); |
|
| 1432 | + } catch (PDOException $e) { |
|
| 1433 | 1433 | return "error : ".$e->getMessage(); |
| 1434 | 1434 | } |
| 1435 | 1435 | |
@@ -1449,7 +1449,7 @@ discard block |
||
| 1449 | 1449 | $Connection = new Connection(); |
| 1450 | 1450 | $sth = $Connection->db->prepare($query); |
| 1451 | 1451 | $sth->execute(array(':source' => $filename)); |
| 1452 | - } catch(PDOException $e) { |
|
| 1452 | + } catch (PDOException $e) { |
|
| 1453 | 1453 | return "error : ".$e->getMessage(); |
| 1454 | 1454 | } |
| 1455 | 1455 | |
@@ -1459,13 +1459,13 @@ discard block |
||
| 1459 | 1459 | $i = 0; |
| 1460 | 1460 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
| 1461 | 1461 | //$Connection->db->beginTransaction(); |
| 1462 | - while (($data = fgetcsv($handle, 1000,"\t")) !== FALSE) |
|
| 1462 | + while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE) |
|
| 1463 | 1463 | { |
| 1464 | 1464 | if ($i > 0 && $data[0] != '') { |
| 1465 | 1465 | $sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]); |
| 1466 | - $period = str_replace(',','',$data[14]); |
|
| 1467 | - if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60; |
|
| 1468 | - if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18])); |
|
| 1466 | + $period = str_replace(',', '', $data[14]); |
|
| 1467 | + if (!empty($period) && strpos($period, 'days')) $period = str_replace(' days', '', $period)*24*60; |
|
| 1468 | + if ($data[18] != '') $launch_date = date('Y-m-d', strtotime($data[18])); |
|
| 1469 | 1469 | else $launch_date = NULL; |
| 1470 | 1470 | $data = array_map(function($value) { |
| 1471 | 1471 | return trim($value) === '' ? null : $value; |
@@ -1475,8 +1475,8 @@ discard block |
||
| 1475 | 1475 | VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)'; |
| 1476 | 1476 | try { |
| 1477 | 1477 | $sth = $Connection->db->prepare($query); |
| 1478 | - $sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',','',$data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',','',$data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+',','),'',$data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',','-1900',' (BOL)',' (EOL)'),'',$data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',',' (BOL)',' (EOL)'),'',$data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20],':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources)); |
|
| 1479 | - } catch(PDOException $e) { |
|
| 1478 | + $sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',', '', $data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',', '', $data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+', ','), '', $data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',', '-1900', ' (BOL)', ' (EOL)'), '', $data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',', ' (BOL)', ' (EOL)'), '', $data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20], ':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources)); |
|
| 1479 | + } catch (PDOException $e) { |
|
| 1480 | 1480 | return "error : ".$e->getMessage(); |
| 1481 | 1481 | } |
| 1482 | 1482 | } |
@@ -1516,7 +1516,7 @@ discard block |
||
| 1516 | 1516 | 'EGYP' => array('country' => 'Egypt', 'owner' => ''), |
| 1517 | 1517 | 'ESA' => array('country' => 'Multinational', 'owner' => 'European Space Agency'), |
| 1518 | 1518 | 'ESRO' => array('country' => 'Multinational', 'owner' => 'European Space Research Organization'), |
| 1519 | - 'EST' => array('country' => 'Estonia','owner' => ''), |
|
| 1519 | + 'EST' => array('country' => 'Estonia', 'owner' => ''), |
|
| 1520 | 1520 | 'EUME' => array('country' => 'Multinational', 'owner' => 'EUMETSAT (European Organization for the Exploitation of Meteorological Satellites)'), |
| 1521 | 1521 | 'EUTE' => array('country' => 'Multinational', 'owner' => 'European Telecommunications Satellite Consortium (EUTELSAT)'), |
| 1522 | 1522 | 'FGER' => array('country' => 'France/Germany', 'owner' => ''), |
@@ -1640,10 +1640,10 @@ discard block |
||
| 1640 | 1640 | { |
| 1641 | 1641 | if ($data != '') { |
| 1642 | 1642 | $result = array(); |
| 1643 | - $result['cospar'] = trim(substr($data,0,11)); |
|
| 1644 | - $result['norad'] = trim(substr($data,13,6)); |
|
| 1645 | - $result['operational'] = trim(substr($data,21,1)); |
|
| 1646 | - $result['name'] = trim(substr($data,23,24)); |
|
| 1643 | + $result['cospar'] = trim(substr($data, 0, 11)); |
|
| 1644 | + $result['norad'] = trim(substr($data, 13, 6)); |
|
| 1645 | + $result['operational'] = trim(substr($data, 21, 1)); |
|
| 1646 | + $result['name'] = trim(substr($data, 23, 24)); |
|
| 1647 | 1647 | /* |
| 1648 | 1648 | * R/B(1) = Rocket body, first stage |
| 1649 | 1649 | * R/B(2) = Rocket body, second stage |
@@ -1655,29 +1655,29 @@ discard block |
||
| 1655 | 1655 | * An ampersand (&) indicates two or more objects are attached |
| 1656 | 1656 | */ |
| 1657 | 1657 | |
| 1658 | - $owner_code = trim(substr($data,49,5)); |
|
| 1658 | + $owner_code = trim(substr($data, 49, 5)); |
|
| 1659 | 1659 | |
| 1660 | 1660 | if (!isset($satcat_sources[$owner_code])) { |
| 1661 | 1661 | echo $data; |
| 1662 | 1662 | echo 'owner_code: '.$owner_code."\n"; |
| 1663 | 1663 | } |
| 1664 | - if (!isset($satcat_launch_site[trim(substr($data,68,5))])) { |
|
| 1665 | - echo 'launch_site_code: '.trim(substr($data,68,5))."\n"; |
|
| 1664 | + if (!isset($satcat_launch_site[trim(substr($data, 68, 5))])) { |
|
| 1665 | + echo 'launch_site_code: '.trim(substr($data, 68, 5))."\n"; |
|
| 1666 | 1666 | } |
| 1667 | 1667 | |
| 1668 | - if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data,68,5))])) { |
|
| 1668 | + if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data, 68, 5))])) { |
|
| 1669 | 1669 | $result['country_owner'] = $satcat_sources[$owner_code]['country']; |
| 1670 | 1670 | $result['owner'] = $satcat_sources[$owner_code]['owner']; |
| 1671 | - $result['launch_date'] = trim(substr($data,56,10)); |
|
| 1672 | - $launch_site_code = trim(substr($data,68,5)); |
|
| 1671 | + $result['launch_date'] = trim(substr($data, 56, 10)); |
|
| 1672 | + $launch_site_code = trim(substr($data, 68, 5)); |
|
| 1673 | 1673 | $result['launch_site'] = $satcat_launch_site[$launch_site_code]; |
| 1674 | - $result['lifetime'] = trim(substr($data,75,10)); |
|
| 1675 | - $result['period'] = trim(substr($data,87,7)); |
|
| 1676 | - $result['inclination'] = trim(substr($data,96,5)); |
|
| 1677 | - $result['apogee'] = trim(substr($data,103,6)); |
|
| 1678 | - $result['perigee'] = trim(substr($data,111,6)); |
|
| 1674 | + $result['lifetime'] = trim(substr($data, 75, 10)); |
|
| 1675 | + $result['period'] = trim(substr($data, 87, 7)); |
|
| 1676 | + $result['inclination'] = trim(substr($data, 96, 5)); |
|
| 1677 | + $result['apogee'] = trim(substr($data, 103, 6)); |
|
| 1678 | + $result['perigee'] = trim(substr($data, 111, 6)); |
|
| 1679 | 1679 | //$result['radarcross'] = trim(substr($data,119,8)); |
| 1680 | - $result['status'] = trim(substr($data,129,3)); |
|
| 1680 | + $result['status'] = trim(substr($data, 129, 3)); |
|
| 1681 | 1681 | //print_r($result); |
| 1682 | 1682 | $result = array_map(function($value) { |
| 1683 | 1683 | return trim($value) === '' ? null : $value; |
@@ -1690,7 +1690,7 @@ discard block |
||
| 1690 | 1690 | $sth = $Connection->db->prepare($query); |
| 1691 | 1691 | $sth->execute(array(':cospar' => $result['cospar'])); |
| 1692 | 1692 | $exist = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1693 | - } catch(PDOException $e) { |
|
| 1693 | + } catch (PDOException $e) { |
|
| 1694 | 1694 | return "error : ".$e->getMessage(); |
| 1695 | 1695 | } |
| 1696 | 1696 | if (empty($exist)) { |
@@ -1702,10 +1702,10 @@ discard block |
||
| 1702 | 1702 | ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
| 1703 | 1703 | ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
| 1704 | 1704 | ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
| 1705 | - ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1705 | + ':contractor' => '', ':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | 1706 | ) |
| 1707 | 1707 | ); |
| 1708 | - } catch(PDOException $e) { |
|
| 1708 | + } catch (PDOException $e) { |
|
| 1709 | 1709 | return "error : ".$e->getMessage(); |
| 1710 | 1710 | } |
| 1711 | 1711 | } elseif ($exist[0]['name'] != $result['name'] && $exist[0]['name_alternate'] != $result['name']) { |
@@ -1713,8 +1713,8 @@ discard block |
||
| 1713 | 1713 | try { |
| 1714 | 1714 | $Connection = new Connection(); |
| 1715 | 1715 | $sth = $Connection->db->prepare($query); |
| 1716 | - $sth->execute(array(':name_alternate' => $result['name'],':cospar' => $result['cospar'])); |
|
| 1717 | - } catch(PDOException $e) { |
|
| 1716 | + $sth->execute(array(':name_alternate' => $result['name'], ':cospar' => $result['cospar'])); |
|
| 1717 | + } catch (PDOException $e) { |
|
| 1718 | 1718 | return "error : ".$e->getMessage(); |
| 1719 | 1719 | } |
| 1720 | 1720 | } |
@@ -1833,13 +1833,13 @@ discard block |
||
| 1833 | 1833 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1834 | 1834 | { |
| 1835 | 1835 | $i++; |
| 1836 | - if($i > 3 && count($row) > 2) { |
|
| 1836 | + if ($i > 3 && count($row) > 2) { |
|
| 1837 | 1837 | $data = array_values(array_filter($row)); |
| 1838 | 1838 | $cntdata = count($data); |
| 1839 | 1839 | if ($cntdata > 10) { |
| 1840 | 1840 | $value = $data[9]; |
| 1841 | 1841 | |
| 1842 | - for ($i =10;$i < $cntdata;$i++) { |
|
| 1842 | + for ($i = 10; $i < $cntdata; $i++) { |
|
| 1843 | 1843 | $value .= ' '.$data[$i]; |
| 1844 | 1844 | } |
| 1845 | 1845 | $data[9] = $value; |
@@ -1849,8 +1849,8 @@ discard block |
||
| 1849 | 1849 | $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)'; |
| 1850 | 1850 | try { |
| 1851 | 1851 | $sth = $Connection->db->prepare($query); |
| 1852 | - $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])); |
|
| 1853 | - } catch(PDOException $e) { |
|
| 1852 | + $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])); |
|
| 1853 | + } catch (PDOException $e) { |
|
| 1854 | 1854 | return "error : ".$e->getMessage(); |
| 1855 | 1855 | } |
| 1856 | 1856 | } |
@@ -1871,7 +1871,7 @@ discard block |
||
| 1871 | 1871 | $Connection = new Connection(); |
| 1872 | 1872 | $sth = $Connection->db->prepare($query); |
| 1873 | 1873 | $sth->execute(); |
| 1874 | - } catch(PDOException $e) { |
|
| 1874 | + } catch (PDOException $e) { |
|
| 1875 | 1875 | return "error : ".$e->getMessage(); |
| 1876 | 1876 | } |
| 1877 | 1877 | |
@@ -1883,12 +1883,12 @@ discard block |
||
| 1883 | 1883 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1884 | 1884 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1885 | 1885 | { |
| 1886 | - if(count($row) > 1) { |
|
| 1886 | + if (count($row) > 1) { |
|
| 1887 | 1887 | $query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')"; |
| 1888 | 1888 | try { |
| 1889 | 1889 | $sth = $Connection->db->prepare($query); |
| 1890 | - $sth->execute(array(':name' => $row[1],':icao' => $row[0])); |
|
| 1891 | - } catch(PDOException $e) { |
|
| 1890 | + $sth->execute(array(':name' => $row[1], ':icao' => $row[0])); |
|
| 1891 | + } catch (PDOException $e) { |
|
| 1892 | 1892 | return "error : ".$e->getMessage(); |
| 1893 | 1893 | } |
| 1894 | 1894 | } |
@@ -1908,21 +1908,21 @@ discard block |
||
| 1908 | 1908 | try { |
| 1909 | 1909 | $sth = $Connection->db->prepare($query); |
| 1910 | 1910 | $sth->execute(); |
| 1911 | - } catch(PDOException $e) { |
|
| 1911 | + } catch (PDOException $e) { |
|
| 1912 | 1912 | return "error : ".$e->getMessage(); |
| 1913 | 1913 | } |
| 1914 | 1914 | } |
| 1915 | 1915 | |
| 1916 | 1916 | |
| 1917 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1917 | + if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1918 | 1918 | else { |
| 1919 | - update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1919 | + update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1920 | 1920 | $query = "CREATE EXTENSION postgis"; |
| 1921 | - $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
|
| 1921 | + $Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']); |
|
| 1922 | 1922 | try { |
| 1923 | 1923 | $sth = $Connection->db->prepare($query); |
| 1924 | 1924 | $sth->execute(); |
| 1925 | - } catch(PDOException $e) { |
|
| 1925 | + } catch (PDOException $e) { |
|
| 1926 | 1926 | return "error : ".$e->getMessage(); |
| 1927 | 1927 | } |
| 1928 | 1928 | } |
@@ -1935,13 +1935,13 @@ discard block |
||
| 1935 | 1935 | include_once('class.create_db.php'); |
| 1936 | 1936 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1937 | 1937 | if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
| 1938 | - update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5'); |
|
| 1938 | + update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5', $tmp_dir.'notam.txt.gz.md5'); |
|
| 1939 | 1939 | $error = ''; |
| 1940 | 1940 | if (file_exists($tmp_dir.'notam.txt.gz.md5')) { |
| 1941 | - $notam_md5_file = explode(' ',file_get_contents($tmp_dir.'notam.txt.gz.md5')); |
|
| 1941 | + $notam_md5_file = explode(' ', file_get_contents($tmp_dir.'notam.txt.gz.md5')); |
|
| 1942 | 1942 | $notam_md5 = $notam_md5_file[0]; |
| 1943 | 1943 | if (!update_db::check_notam_version($notam_md5)) { |
| 1944 | - update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
|
| 1944 | + update_db::download('http://data.flightairmap.com/data/notam.txt.gz', $tmp_dir.'notam.txt.gz'); |
|
| 1945 | 1945 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1946 | 1946 | if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) { |
| 1947 | 1947 | if ($globalDebug) echo "Gunzip..."; |
@@ -1977,14 +1977,14 @@ discard block |
||
| 1977 | 1977 | try { |
| 1978 | 1978 | $sth = $Connection->db->prepare($query); |
| 1979 | 1979 | $sth->execute(); |
| 1980 | - } catch(PDOException $e) { |
|
| 1980 | + } catch (PDOException $e) { |
|
| 1981 | 1981 | echo "error : ".$e->getMessage(); |
| 1982 | 1982 | } |
| 1983 | 1983 | } |
| 1984 | 1984 | if ($globalDBdriver == 'mysql') { |
| 1985 | - update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1985 | + update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1986 | 1986 | } else { |
| 1987 | - update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1987 | + update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1988 | 1988 | } |
| 1989 | 1989 | $error = create_db::import_file($tmp_dir.'countries.sql'); |
| 1990 | 1990 | return $error; |
@@ -1997,7 +1997,7 @@ discard block |
||
| 1997 | 1997 | // update_db::unzip($tmp_dir.'AptNav.zip'); |
| 1998 | 1998 | // update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz'); |
| 1999 | 1999 | // 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'); |
| 2000 | - 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'); |
|
| 2000 | + 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'); |
|
| 2001 | 2001 | update_db::gunzip($tmp_dir.'awy.dat.gz'); |
| 2002 | 2002 | $error = update_db::waypoints($tmp_dir.'awy.dat'); |
| 2003 | 2003 | return $error; |
@@ -2018,7 +2018,7 @@ discard block |
||
| 2018 | 2018 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 2019 | 2019 | if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
| 2020 | 2020 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 2021 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 2021 | + if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 2022 | 2022 | } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
| 2023 | 2023 | } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
| 2024 | 2024 | } else $error = "ZIP module not loaded but required for IVAO."; |
@@ -2032,7 +2032,7 @@ discard block |
||
| 2032 | 2032 | global $tmp_dir, $globalDebug; |
| 2033 | 2033 | $error = ''; |
| 2034 | 2034 | if ($globalDebug) echo "Routes : Download..."; |
| 2035 | - update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
|
| 2035 | + update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz'); |
|
| 2036 | 2036 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 2037 | 2037 | if ($globalDebug) echo "Gunzip..."; |
| 2038 | 2038 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
@@ -2048,7 +2048,7 @@ discard block |
||
| 2048 | 2048 | global $tmp_dir, $globalDebug; |
| 2049 | 2049 | $error = ''; |
| 2050 | 2050 | if ($globalDebug) echo "Schedules Oneworld : Download..."; |
| 2051 | - update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
|
| 2051 | + update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz'); |
|
| 2052 | 2052 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 2053 | 2053 | if ($globalDebug) echo "Gunzip..."; |
| 2054 | 2054 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
@@ -2064,7 +2064,7 @@ discard block |
||
| 2064 | 2064 | global $tmp_dir, $globalDebug; |
| 2065 | 2065 | $error = ''; |
| 2066 | 2066 | if ($globalDebug) echo "Schedules Skyteam : Download..."; |
| 2067 | - update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
|
| 2067 | + update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz'); |
|
| 2068 | 2068 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 2069 | 2069 | if ($globalDebug) echo "Gunzip..."; |
| 2070 | 2070 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
@@ -2092,7 +2092,7 @@ discard block |
||
| 2092 | 2092 | */ |
| 2093 | 2093 | if ($globalDebug) echo "Modes : Download..."; |
| 2094 | 2094 | // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
| 2095 | - update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
|
| 2095 | + update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz'); |
|
| 2096 | 2096 | |
| 2097 | 2097 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 2098 | 2098 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
@@ -2112,7 +2112,7 @@ discard block |
||
| 2112 | 2112 | public static function update_ModeS_faa() { |
| 2113 | 2113 | global $tmp_dir, $globalDebug; |
| 2114 | 2114 | if ($globalDebug) echo "Modes FAA: Download..."; |
| 2115 | - update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
|
| 2115 | + update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip'); |
|
| 2116 | 2116 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 2117 | 2117 | if ($globalDebug) echo "Unzip..."; |
| 2118 | 2118 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
@@ -2128,7 +2128,7 @@ discard block |
||
| 2128 | 2128 | public static function update_ModeS_flarm() { |
| 2129 | 2129 | global $tmp_dir, $globalDebug; |
| 2130 | 2130 | if ($globalDebug) echo "Modes Flarmnet: Download..."; |
| 2131 | - update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
|
| 2131 | + update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln'); |
|
| 2132 | 2132 | if (file_exists($tmp_dir.'data.fln')) { |
| 2133 | 2133 | if ($globalDebug) echo "Add to DB..."; |
| 2134 | 2134 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
@@ -2142,7 +2142,7 @@ discard block |
||
| 2142 | 2142 | public static function update_ModeS_ogn() { |
| 2143 | 2143 | global $tmp_dir, $globalDebug; |
| 2144 | 2144 | if ($globalDebug) echo "Modes OGN: Download..."; |
| 2145 | - update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
|
| 2145 | + update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv'); |
|
| 2146 | 2146 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 2147 | 2147 | if ($globalDebug) echo "Add to DB..."; |
| 2148 | 2148 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
@@ -2157,201 +2157,201 @@ discard block |
||
| 2157 | 2157 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 2158 | 2158 | |
| 2159 | 2159 | if ($globalDebug) echo "Owner France: Download..."; |
| 2160 | - update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
|
| 2160 | + update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv'); |
|
| 2161 | 2161 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 2162 | 2162 | if ($globalDebug) echo "Add to DB..."; |
| 2163 | - $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
|
| 2163 | + $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F'); |
|
| 2164 | 2164 | } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
| 2165 | 2165 | if ($error != '') { |
| 2166 | 2166 | return $error; |
| 2167 | 2167 | } elseif ($globalDebug) echo "Done\n"; |
| 2168 | 2168 | |
| 2169 | 2169 | if ($globalDebug) echo "Owner Ireland: Download..."; |
| 2170 | - update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
|
| 2170 | + update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv'); |
|
| 2171 | 2171 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 2172 | 2172 | if ($globalDebug) echo "Add to DB..."; |
| 2173 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
|
| 2173 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI'); |
|
| 2174 | 2174 | } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
| 2175 | 2175 | if ($error != '') { |
| 2176 | 2176 | return $error; |
| 2177 | 2177 | } elseif ($globalDebug) echo "Done\n"; |
| 2178 | 2178 | if ($globalDebug) echo "Owner Switzerland: Download..."; |
| 2179 | - update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
|
| 2179 | + update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv'); |
|
| 2180 | 2180 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 2181 | 2181 | if ($globalDebug) echo "Add to DB..."; |
| 2182 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
|
| 2182 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB'); |
|
| 2183 | 2183 | } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
| 2184 | 2184 | if ($error != '') { |
| 2185 | 2185 | return $error; |
| 2186 | 2186 | } elseif ($globalDebug) echo "Done\n"; |
| 2187 | 2187 | if ($globalDebug) echo "Owner Czech Republic: Download..."; |
| 2188 | - update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
|
| 2188 | + update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv'); |
|
| 2189 | 2189 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 2190 | 2190 | if ($globalDebug) echo "Add to DB..."; |
| 2191 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
|
| 2191 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK'); |
|
| 2192 | 2192 | } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
| 2193 | 2193 | if ($error != '') { |
| 2194 | 2194 | return $error; |
| 2195 | 2195 | } elseif ($globalDebug) echo "Done\n"; |
| 2196 | 2196 | if ($globalDebug) echo "Owner Australia: Download..."; |
| 2197 | - update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
|
| 2197 | + update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv'); |
|
| 2198 | 2198 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 2199 | 2199 | if ($globalDebug) echo "Add to DB..."; |
| 2200 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
|
| 2200 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH'); |
|
| 2201 | 2201 | } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
| 2202 | 2202 | if ($error != '') { |
| 2203 | 2203 | return $error; |
| 2204 | 2204 | } elseif ($globalDebug) echo "Done\n"; |
| 2205 | 2205 | if ($globalDebug) echo "Owner Austria: Download..."; |
| 2206 | - update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
|
| 2206 | + update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv'); |
|
| 2207 | 2207 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 2208 | 2208 | if ($globalDebug) echo "Add to DB..."; |
| 2209 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
|
| 2209 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE'); |
|
| 2210 | 2210 | } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
| 2211 | 2211 | if ($error != '') { |
| 2212 | 2212 | return $error; |
| 2213 | 2213 | } elseif ($globalDebug) echo "Done\n"; |
| 2214 | 2214 | if ($globalDebug) echo "Owner Chile: Download..."; |
| 2215 | - update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
|
| 2215 | + update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv'); |
|
| 2216 | 2216 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 2217 | 2217 | if ($globalDebug) echo "Add to DB..."; |
| 2218 | - $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
|
| 2218 | + $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC'); |
|
| 2219 | 2219 | } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
| 2220 | 2220 | if ($error != '') { |
| 2221 | 2221 | return $error; |
| 2222 | 2222 | } elseif ($globalDebug) echo "Done\n"; |
| 2223 | 2223 | if ($globalDebug) echo "Owner Colombia: Download..."; |
| 2224 | - update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
|
| 2224 | + update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv'); |
|
| 2225 | 2225 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 2226 | 2226 | if ($globalDebug) echo "Add to DB..."; |
| 2227 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
|
| 2227 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ'); |
|
| 2228 | 2228 | } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
| 2229 | 2229 | if ($error != '') { |
| 2230 | 2230 | return $error; |
| 2231 | 2231 | } elseif ($globalDebug) echo "Done\n"; |
| 2232 | 2232 | if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
| 2233 | - update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
|
| 2233 | + update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv'); |
|
| 2234 | 2234 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 2235 | 2235 | if ($globalDebug) echo "Add to DB..."; |
| 2236 | - $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
|
| 2236 | + $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7'); |
|
| 2237 | 2237 | } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
| 2238 | 2238 | if ($error != '') { |
| 2239 | 2239 | return $error; |
| 2240 | 2240 | } elseif ($globalDebug) echo "Done\n"; |
| 2241 | 2241 | if ($globalDebug) echo "Owner Brazil: Download..."; |
| 2242 | - update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
|
| 2242 | + update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv'); |
|
| 2243 | 2243 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 2244 | 2244 | if ($globalDebug) echo "Add to DB..."; |
| 2245 | - $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
|
| 2245 | + $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP'); |
|
| 2246 | 2246 | } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
| 2247 | 2247 | if ($error != '') { |
| 2248 | 2248 | return $error; |
| 2249 | 2249 | } elseif ($globalDebug) echo "Done\n"; |
| 2250 | 2250 | if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
| 2251 | - update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
|
| 2251 | + update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv'); |
|
| 2252 | 2252 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 2253 | 2253 | if ($globalDebug) echo "Add to DB..."; |
| 2254 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
|
| 2254 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP'); |
|
| 2255 | 2255 | } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
| 2256 | 2256 | if ($error != '') { |
| 2257 | 2257 | return $error; |
| 2258 | 2258 | } elseif ($globalDebug) echo "Done\n"; |
| 2259 | 2259 | if ($globalDebug) echo "Owner Croatia: Download..."; |
| 2260 | - update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
|
| 2260 | + update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv'); |
|
| 2261 | 2261 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 2262 | 2262 | if ($globalDebug) echo "Add to DB..."; |
| 2263 | - $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
|
| 2263 | + $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A'); |
|
| 2264 | 2264 | } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
| 2265 | 2265 | if ($error != '') { |
| 2266 | 2266 | return $error; |
| 2267 | 2267 | } elseif ($globalDebug) echo "Done\n"; |
| 2268 | 2268 | if ($globalDebug) echo "Owner Luxembourg: Download..."; |
| 2269 | - update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
|
| 2269 | + update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv'); |
|
| 2270 | 2270 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 2271 | 2271 | if ($globalDebug) echo "Add to DB..."; |
| 2272 | - $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
|
| 2272 | + $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX'); |
|
| 2273 | 2273 | } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
| 2274 | 2274 | if ($error != '') { |
| 2275 | 2275 | return $error; |
| 2276 | 2276 | } elseif ($globalDebug) echo "Done\n"; |
| 2277 | 2277 | if ($globalDebug) echo "Owner Maldives: Download..."; |
| 2278 | - update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
|
| 2278 | + update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv'); |
|
| 2279 | 2279 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 2280 | 2280 | if ($globalDebug) echo "Add to DB..."; |
| 2281 | - $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
|
| 2281 | + $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q'); |
|
| 2282 | 2282 | } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
| 2283 | 2283 | if ($error != '') { |
| 2284 | 2284 | return $error; |
| 2285 | 2285 | } elseif ($globalDebug) echo "Done\n"; |
| 2286 | 2286 | if ($globalDebug) echo "Owner New Zealand: Download..."; |
| 2287 | - update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
|
| 2287 | + update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv'); |
|
| 2288 | 2288 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 2289 | 2289 | if ($globalDebug) echo "Add to DB..."; |
| 2290 | - $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
|
| 2290 | + $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK'); |
|
| 2291 | 2291 | } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
| 2292 | 2292 | if ($error != '') { |
| 2293 | 2293 | return $error; |
| 2294 | 2294 | } elseif ($globalDebug) echo "Done\n"; |
| 2295 | 2295 | if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
| 2296 | - update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
|
| 2296 | + update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv'); |
|
| 2297 | 2297 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 2298 | 2298 | if ($globalDebug) echo "Add to DB..."; |
| 2299 | - $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
|
| 2299 | + $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2'); |
|
| 2300 | 2300 | } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
| 2301 | 2301 | if ($error != '') { |
| 2302 | 2302 | return $error; |
| 2303 | 2303 | } elseif ($globalDebug) echo "Done\n"; |
| 2304 | 2304 | if ($globalDebug) echo "Owner Slovakia: Download..."; |
| 2305 | - update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
|
| 2305 | + update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv'); |
|
| 2306 | 2306 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 2307 | 2307 | if ($globalDebug) echo "Add to DB..."; |
| 2308 | - $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
|
| 2308 | + $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM'); |
|
| 2309 | 2309 | } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
| 2310 | 2310 | if ($error != '') { |
| 2311 | 2311 | return $error; |
| 2312 | 2312 | } elseif ($globalDebug) echo "Done\n"; |
| 2313 | 2313 | if ($globalDebug) echo "Owner Ecuador: Download..."; |
| 2314 | - update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
|
| 2314 | + update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv'); |
|
| 2315 | 2315 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 2316 | 2316 | if ($globalDebug) echo "Add to DB..."; |
| 2317 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
|
| 2317 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC'); |
|
| 2318 | 2318 | } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
| 2319 | 2319 | if ($error != '') { |
| 2320 | 2320 | return $error; |
| 2321 | 2321 | } elseif ($globalDebug) echo "Done\n"; |
| 2322 | 2322 | if ($globalDebug) echo "Owner Iceland: Download..."; |
| 2323 | - update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
|
| 2323 | + update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv'); |
|
| 2324 | 2324 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 2325 | 2325 | if ($globalDebug) echo "Add to DB..."; |
| 2326 | - $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
|
| 2326 | + $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF'); |
|
| 2327 | 2327 | } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
| 2328 | 2328 | if ($error != '') { |
| 2329 | 2329 | return $error; |
| 2330 | 2330 | } elseif ($globalDebug) echo "Done\n"; |
| 2331 | 2331 | if ($globalDebug) echo "Owner Isle of Man: Download..."; |
| 2332 | - update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
|
| 2332 | + update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv'); |
|
| 2333 | 2333 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 2334 | 2334 | if ($globalDebug) echo "Add to DB..."; |
| 2335 | - $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
|
| 2335 | + $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M'); |
|
| 2336 | 2336 | } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
| 2337 | 2337 | if ($error != '') { |
| 2338 | 2338 | return $error; |
| 2339 | 2339 | } elseif ($globalDebug) echo "Done\n"; |
| 2340 | 2340 | if ($globalMasterSource) { |
| 2341 | 2341 | if ($globalDebug) echo "ModeS Netherlands: Download..."; |
| 2342 | - update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
|
| 2342 | + update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv'); |
|
| 2343 | 2343 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 2344 | 2344 | if ($globalDebug) echo "Add to DB..."; |
| 2345 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
|
| 2345 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH'); |
|
| 2346 | 2346 | } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
| 2347 | 2347 | if ($error != '') { |
| 2348 | 2348 | return $error; |
| 2349 | 2349 | } elseif ($globalDebug) echo "Done\n"; |
| 2350 | 2350 | if ($globalDebug) echo "ModeS Denmark: Download..."; |
| 2351 | - update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
|
| 2351 | + update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv'); |
|
| 2352 | 2352 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 2353 | 2353 | if ($globalDebug) echo "Add to DB..."; |
| 2354 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
|
| 2354 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY'); |
|
| 2355 | 2355 | } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
| 2356 | 2356 | if ($error != '') { |
| 2357 | 2357 | return $error; |
@@ -2364,7 +2364,7 @@ discard block |
||
| 2364 | 2364 | global $tmp_dir, $globalDebug; |
| 2365 | 2365 | $error = ''; |
| 2366 | 2366 | if ($globalDebug) echo "Translation : Download..."; |
| 2367 | - update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
|
| 2367 | + update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip'); |
|
| 2368 | 2368 | if (file_exists($tmp_dir.'translation.zip')) { |
| 2369 | 2369 | if ($globalDebug) echo "Unzip..."; |
| 2370 | 2370 | update_db::unzip($tmp_dir.'translation.zip'); |
@@ -2381,10 +2381,10 @@ discard block |
||
| 2381 | 2381 | global $tmp_dir, $globalDebug; |
| 2382 | 2382 | $error = ''; |
| 2383 | 2383 | if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
| 2384 | - update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
|
| 2385 | - update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5'); |
|
| 2384 | + update_db::download('http://data.flightairmap.com/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz'); |
|
| 2385 | + update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5', $tmp_dir.'translation.tsv.gz.md5'); |
|
| 2386 | 2386 | if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) { |
| 2387 | - $translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
|
| 2387 | + $translation_md5_file = explode(' ', file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
|
| 2388 | 2388 | $translation_md5 = $translation_md5_file[0]; |
| 2389 | 2389 | if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) { |
| 2390 | 2390 | if ($globalDebug) echo "Gunzip..."; |
@@ -2402,10 +2402,10 @@ discard block |
||
| 2402 | 2402 | global $tmp_dir, $globalDebug; |
| 2403 | 2403 | $error = ''; |
| 2404 | 2404 | if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
| 2405 | - update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
|
| 2406 | - update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5'); |
|
| 2405 | + update_db::download('http://data.flightairmap.com/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz'); |
|
| 2406 | + update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5', $tmp_dir.'modes.tsv.gz.md5'); |
|
| 2407 | 2407 | if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) { |
| 2408 | - $modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
|
| 2408 | + $modes_md5_file = explode(' ', file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
|
| 2409 | 2409 | $modes_md5 = $modes_md5_file[0]; |
| 2410 | 2410 | if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) { |
| 2411 | 2411 | if ($globalDebug) echo "Gunzip..."; |
@@ -2424,12 +2424,12 @@ discard block |
||
| 2424 | 2424 | global $tmp_dir, $globalDebug; |
| 2425 | 2425 | $error = ''; |
| 2426 | 2426 | if ($globalDebug) echo "Airlines from FlightAirMap website : Download..."; |
| 2427 | - update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5'); |
|
| 2427 | + update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5', $tmp_dir.'airlines.tsv.gz.md5'); |
|
| 2428 | 2428 | if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) { |
| 2429 | - $airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
|
| 2429 | + $airlines_md5_file = explode(' ', file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
|
| 2430 | 2430 | $airlines_md5 = $airlines_md5_file[0]; |
| 2431 | 2431 | if (!update_db::check_airlines_version($airlines_md5)) { |
| 2432 | - update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz'); |
|
| 2432 | + update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz', $tmp_dir.'airlines.tsv.gz'); |
|
| 2433 | 2433 | if (file_exists($tmp_dir.'airlines.tsv.gz')) { |
| 2434 | 2434 | if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) { |
| 2435 | 2435 | if ($globalDebug) echo "Gunzip..."; |
@@ -2454,14 +2454,14 @@ discard block |
||
| 2454 | 2454 | if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
| 2455 | 2455 | $error = ''; |
| 2456 | 2456 | if ($globalOwner === TRUE) { |
| 2457 | - update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2458 | - update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5'); |
|
| 2457 | + update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2458 | + update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5'); |
|
| 2459 | 2459 | } else { |
| 2460 | - update_db::download('http://data.flightairmap.com/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2461 | - update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5'); |
|
| 2460 | + update_db::download('http://data.flightairmap.com/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2461 | + update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5'); |
|
| 2462 | 2462 | } |
| 2463 | 2463 | if (file_exists($tmp_dir.'owners.tsv.gz') && file_exists($tmp_dir.'owners.tsv.gz.md5')) { |
| 2464 | - $owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
|
| 2464 | + $owners_md5_file = explode(' ', file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
|
| 2465 | 2465 | $owners_md5 = $owners_md5_file[0]; |
| 2466 | 2466 | if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) { |
| 2467 | 2467 | if ($globalDebug) echo "Gunzip..."; |
@@ -2478,10 +2478,10 @@ discard block |
||
| 2478 | 2478 | public static function update_routes_fam() { |
| 2479 | 2479 | global $tmp_dir, $globalDebug; |
| 2480 | 2480 | if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
| 2481 | - update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
|
| 2482 | - update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5'); |
|
| 2481 | + update_db::download('http://data.flightairmap.com/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz'); |
|
| 2482 | + update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5', $tmp_dir.'routes.tsv.gz.md5'); |
|
| 2483 | 2483 | if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) { |
| 2484 | - $routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
|
| 2484 | + $routes_md5_file = explode(' ', file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
|
| 2485 | 2485 | $routes_md5 = $routes_md5_file[0]; |
| 2486 | 2486 | if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) { |
| 2487 | 2487 | if ($globalDebug) echo "Gunzip..."; |
@@ -2497,13 +2497,13 @@ discard block |
||
| 2497 | 2497 | } |
| 2498 | 2498 | public static function update_marine_identity_fam() { |
| 2499 | 2499 | global $tmp_dir, $globalDebug; |
| 2500 | - update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2500 | + update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2501 | 2501 | if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) { |
| 2502 | - $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2502 | + $marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2503 | 2503 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2504 | 2504 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2505 | 2505 | if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
| 2506 | - update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
|
| 2506 | + update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz'); |
|
| 2507 | 2507 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2508 | 2508 | if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) { |
| 2509 | 2509 | if ($globalDebug) echo "Gunzip..."; |
@@ -2525,13 +2525,13 @@ discard block |
||
| 2525 | 2525 | |
| 2526 | 2526 | public static function update_satellite_fam() { |
| 2527 | 2527 | global $tmp_dir, $globalDebug; |
| 2528 | - update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5',$tmp_dir.'satellite.tsv.gz.md5'); |
|
| 2528 | + update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5', $tmp_dir.'satellite.tsv.gz.md5'); |
|
| 2529 | 2529 | if (file_exists($tmp_dir.'satellite.tsv.gz.md5')) { |
| 2530 | - $satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
|
| 2530 | + $satellite_md5_file = explode(' ', file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
|
| 2531 | 2531 | $satellite_md5 = $satellite_md5_file[0]; |
| 2532 | 2532 | if (!update_db::check_satellite_version($satellite_md5)) { |
| 2533 | 2533 | if ($globalDebug) echo "Satellite from FlightAirMap website : Download..."; |
| 2534 | - update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz'); |
|
| 2534 | + update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz', $tmp_dir.'satellite.tsv.gz'); |
|
| 2535 | 2535 | if (file_exists($tmp_dir.'satellite.tsv.gz')) { |
| 2536 | 2536 | if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) { |
| 2537 | 2537 | if ($globalDebug) echo "Gunzip..."; |
@@ -2553,7 +2553,7 @@ discard block |
||
| 2553 | 2553 | public static function update_banned_fam() { |
| 2554 | 2554 | global $tmp_dir, $globalDebug; |
| 2555 | 2555 | if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
| 2556 | - update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
|
| 2556 | + update_db::download('http://data.flightairmap.com/data/ban-eu.csv', $tmp_dir.'ban_eu.csv'); |
|
| 2557 | 2557 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2558 | 2558 | //if ($globalDebug) echo "Gunzip..."; |
| 2559 | 2559 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
@@ -2572,18 +2572,18 @@ discard block |
||
| 2572 | 2572 | $error = ''; |
| 2573 | 2573 | if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
| 2574 | 2574 | if ($globalDBdriver == 'mysql') { |
| 2575 | - update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2575 | + update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2576 | 2576 | } else { |
| 2577 | - update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2577 | + update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2578 | 2578 | } |
| 2579 | 2579 | if (file_exists($tmp_dir.'airspace.sql.gz.md5')) { |
| 2580 | - $airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2580 | + $airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2581 | 2581 | $airspace_md5 = $airspace_md5_file[0]; |
| 2582 | 2582 | if (!update_db::check_airspace_version($airspace_md5)) { |
| 2583 | 2583 | if ($globalDBdriver == 'mysql') { |
| 2584 | - update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2584 | + update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2585 | 2585 | } else { |
| 2586 | - update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2586 | + update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2587 | 2587 | } |
| 2588 | 2588 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2589 | 2589 | if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) { |
@@ -2596,7 +2596,7 @@ discard block |
||
| 2596 | 2596 | try { |
| 2597 | 2597 | $sth = $Connection->db->prepare($query); |
| 2598 | 2598 | $sth->execute(); |
| 2599 | - } catch(PDOException $e) { |
|
| 2599 | + } catch (PDOException $e) { |
|
| 2600 | 2600 | return "error : ".$e->getMessage(); |
| 2601 | 2601 | } |
| 2602 | 2602 | } |
@@ -2616,16 +2616,16 @@ discard block |
||
| 2616 | 2616 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
| 2617 | 2617 | $error = ''; |
| 2618 | 2618 | if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
| 2619 | - update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2619 | + update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5', $tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2620 | 2620 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
| 2621 | - $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2621 | + $geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2622 | 2622 | $geoid_md5 = $geoid_md5_file[0]; |
| 2623 | 2623 | if (!update_db::check_geoid_version($geoid_md5)) { |
| 2624 | - update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2624 | + update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz', $tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2625 | 2625 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
| 2626 | 2626 | if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) { |
| 2627 | 2627 | if ($globalDebug) echo "Gunzip..."; |
| 2628 | - update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2628 | + update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz', dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2629 | 2629 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
| 2630 | 2630 | update_db::insert_geoid_version($geoid_md5); |
| 2631 | 2631 | } |
@@ -2642,15 +2642,15 @@ discard block |
||
| 2642 | 2642 | public static function update_tle() { |
| 2643 | 2643 | global $tmp_dir, $globalDebug; |
| 2644 | 2644 | if ($globalDebug) echo "Download TLE : Download..."; |
| 2645 | - $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', |
|
| 2646 | - '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', |
|
| 2647 | - 'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt'); |
|
| 2645 | + $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', |
|
| 2646 | + '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', |
|
| 2647 | + 'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt', 'visual.txt', 'sarsat.txt', 'argos.txt', 'ses.txt', 'iridium-NEXT.txt', 'beidou.txt'); |
|
| 2648 | 2648 | foreach ($alltle as $filename) { |
| 2649 | 2649 | if ($globalDebug) echo "downloading ".$filename.'...'; |
| 2650 | - update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
|
| 2650 | + update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename); |
|
| 2651 | 2651 | if (file_exists($tmp_dir.$filename)) { |
| 2652 | 2652 | if ($globalDebug) echo "Add to DB ".$filename."..."; |
| 2653 | - $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
|
| 2653 | + $error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename)); |
|
| 2654 | 2654 | } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
| 2655 | 2655 | if ($error != '') { |
| 2656 | 2656 | echo $error."\n"; |
@@ -2662,7 +2662,7 @@ discard block |
||
| 2662 | 2662 | public static function update_ucsdb() { |
| 2663 | 2663 | global $tmp_dir, $globalDebug; |
| 2664 | 2664 | if ($globalDebug) echo "Download UCS DB : Download..."; |
| 2665 | - update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
|
| 2665 | + update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt', $tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
|
| 2666 | 2666 | if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) { |
| 2667 | 2667 | if ($globalDebug) echo "Add to DB..."; |
| 2668 | 2668 | $error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
@@ -2676,7 +2676,7 @@ discard block |
||
| 2676 | 2676 | public static function update_celestrak() { |
| 2677 | 2677 | global $tmp_dir, $globalDebug; |
| 2678 | 2678 | if ($globalDebug) echo "Download Celestrak DB : Download..."; |
| 2679 | - update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt'); |
|
| 2679 | + update_db::download('http://celestrak.com/pub/satcat.txt', $tmp_dir.'satcat.txt'); |
|
| 2680 | 2680 | if (file_exists($tmp_dir.'satcat.txt')) { |
| 2681 | 2681 | if ($globalDebug) echo "Add to DB..."; |
| 2682 | 2682 | $error = update_db::satellite_celestrak($tmp_dir.'satcat.txt'); |
@@ -2691,32 +2691,32 @@ discard block |
||
| 2691 | 2691 | global $tmp_dir, $globalDebug; |
| 2692 | 2692 | $error = ''; |
| 2693 | 2693 | if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
| 2694 | - update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
|
| 2694 | + update_db::download('http://data.flightairmap.com/data/models/models.md5sum', $tmp_dir.'models.md5sum'); |
|
| 2695 | 2695 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2696 | 2696 | if ($globalDebug) echo "Check files...\n"; |
| 2697 | 2697 | $newmodelsdb = array(); |
| 2698 | - if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
|
| 2699 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2698 | + if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) { |
|
| 2699 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2700 | 2700 | $model = trim($row[2]); |
| 2701 | 2701 | $newmodelsdb[$model] = trim($row[0]); |
| 2702 | 2702 | } |
| 2703 | 2703 | } |
| 2704 | 2704 | $modelsdb = array(); |
| 2705 | 2705 | if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) { |
| 2706 | - if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) { |
|
| 2707 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2706 | + if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) { |
|
| 2707 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2708 | 2708 | $model = trim($row[2]); |
| 2709 | 2709 | $modelsdb[$model] = trim($row[0]); |
| 2710 | 2710 | } |
| 2711 | 2711 | } |
| 2712 | 2712 | } |
| 2713 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2713 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2714 | 2714 | foreach ($diff as $key => $value) { |
| 2715 | 2715 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
| 2716 | - update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
|
| 2716 | + update_db::download('http://data.flightairmap.com/data/models/'.$key, dirname(__FILE__).'/../models/'.$key); |
|
| 2717 | 2717 | |
| 2718 | 2718 | } |
| 2719 | - update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2719 | + update_db::download('http://data.flightairmap.com/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2720 | 2720 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2721 | 2721 | if ($error != '') { |
| 2722 | 2722 | return $error; |
@@ -2728,32 +2728,32 @@ discard block |
||
| 2728 | 2728 | global $tmp_dir, $globalDebug; |
| 2729 | 2729 | $error = ''; |
| 2730 | 2730 | if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
| 2731 | - update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
|
| 2731 | + update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum'); |
|
| 2732 | 2732 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2733 | 2733 | if ($globalDebug) echo "Check files...\n"; |
| 2734 | 2734 | $newmodelsdb = array(); |
| 2735 | - if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
|
| 2736 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2735 | + if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) { |
|
| 2736 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2737 | 2737 | $model = trim($row[2]); |
| 2738 | 2738 | $newmodelsdb[$model] = trim($row[0]); |
| 2739 | 2739 | } |
| 2740 | 2740 | } |
| 2741 | 2741 | $modelsdb = array(); |
| 2742 | 2742 | if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) { |
| 2743 | - if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) { |
|
| 2744 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2743 | + if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) { |
|
| 2744 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2745 | 2745 | $model = trim($row[2]); |
| 2746 | 2746 | $modelsdb[$model] = trim($row[0]); |
| 2747 | 2747 | } |
| 2748 | 2748 | } |
| 2749 | 2749 | } |
| 2750 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2750 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2751 | 2751 | foreach ($diff as $key => $value) { |
| 2752 | 2752 | if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
| 2753 | - update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
|
| 2753 | + update_db::download('http://data.flightairmap.com/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key); |
|
| 2754 | 2754 | |
| 2755 | 2755 | } |
| 2756 | - update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2756 | + update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2757 | 2757 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2758 | 2758 | if ($error != '') { |
| 2759 | 2759 | return $error; |
@@ -2765,32 +2765,32 @@ discard block |
||
| 2765 | 2765 | global $tmp_dir, $globalDebug; |
| 2766 | 2766 | $error = ''; |
| 2767 | 2767 | if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
| 2768 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
|
| 2768 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum'); |
|
| 2769 | 2769 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2770 | 2770 | if ($globalDebug) echo "Check files...\n"; |
| 2771 | 2771 | $newmodelsdb = array(); |
| 2772 | - if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2773 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2772 | + if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2773 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2774 | 2774 | $model = trim($row[2]); |
| 2775 | 2775 | $newmodelsdb[$model] = trim($row[0]); |
| 2776 | 2776 | } |
| 2777 | 2777 | } |
| 2778 | 2778 | $modelsdb = array(); |
| 2779 | 2779 | if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) { |
| 2780 | - if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2781 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2780 | + if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2781 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2782 | 2782 | $model = trim($row[2]); |
| 2783 | 2783 | $modelsdb[$model] = trim($row[0]); |
| 2784 | 2784 | } |
| 2785 | 2785 | } |
| 2786 | 2786 | } |
| 2787 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2787 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2788 | 2788 | foreach ($diff as $key => $value) { |
| 2789 | 2789 | if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
| 2790 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2790 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2791 | 2791 | |
| 2792 | 2792 | } |
| 2793 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2793 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2794 | 2794 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2795 | 2795 | if ($error != '') { |
| 2796 | 2796 | return $error; |
@@ -2813,8 +2813,8 @@ discard block |
||
| 2813 | 2813 | */ |
| 2814 | 2814 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2815 | 2815 | //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
| 2816 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2817 | - $result = fread($fh,100000000); |
|
| 2816 | + $fh = fopen($tmp_dir.'aircrafts.html', "r"); |
|
| 2817 | + $result = fread($fh, 100000000); |
|
| 2818 | 2818 | //echo $result; |
| 2819 | 2819 | //var_dump(str_get_html($result)); |
| 2820 | 2820 | //print_r(self::table2array($result)); |
@@ -2832,23 +2832,23 @@ discard block |
||
| 2832 | 2832 | $Connection = new Connection(); |
| 2833 | 2833 | $sth = $Connection->db->prepare($query); |
| 2834 | 2834 | $sth->execute(); |
| 2835 | - } catch(PDOException $e) { |
|
| 2835 | + } catch (PDOException $e) { |
|
| 2836 | 2836 | return "error : ".$e->getMessage(); |
| 2837 | 2837 | } |
| 2838 | 2838 | |
| 2839 | 2839 | $error = ''; |
| 2840 | 2840 | if ($globalDebug) echo "Notam : Download..."; |
| 2841 | - update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
|
| 2841 | + update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss'); |
|
| 2842 | 2842 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2843 | - $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
|
| 2843 | + $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true); |
|
| 2844 | 2844 | foreach ($notams['channel']['item'] as $notam) { |
| 2845 | - $title = explode(':',$notam['title']); |
|
| 2845 | + $title = explode(':', $notam['title']); |
|
| 2846 | 2846 | $data['ref'] = trim($title[0]); |
| 2847 | 2847 | unset($title[0]); |
| 2848 | - $data['title'] = trim(implode(':',$title)); |
|
| 2849 | - $description = strip_tags($notam['description'],'<pre>'); |
|
| 2850 | - preg_match(':^(.*?)<pre>:',$description,$match); |
|
| 2851 | - $q = explode('/',$match[1]); |
|
| 2848 | + $data['title'] = trim(implode(':', $title)); |
|
| 2849 | + $description = strip_tags($notam['description'], '<pre>'); |
|
| 2850 | + preg_match(':^(.*?)<pre>:', $description, $match); |
|
| 2851 | + $q = explode('/', $match[1]); |
|
| 2852 | 2852 | $data['fir'] = $q[0]; |
| 2853 | 2853 | $data['code'] = $q[1]; |
| 2854 | 2854 | $ifrvfr = $q[2]; |
@@ -2864,30 +2864,30 @@ discard block |
||
| 2864 | 2864 | $data['lower_limit'] = $q[5]; |
| 2865 | 2865 | $data['upper_limit'] = $q[6]; |
| 2866 | 2866 | $latlonrad = $q[7]; |
| 2867 | - sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
|
| 2868 | - $latitude = $Common->convertDec($las,'latitude'); |
|
| 2869 | - $longitude = $Common->convertDec($lns,'longitude'); |
|
| 2867 | + sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius); |
|
| 2868 | + $latitude = $Common->convertDec($las, 'latitude'); |
|
| 2869 | + $longitude = $Common->convertDec($lns, 'longitude'); |
|
| 2870 | 2870 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 2871 | 2871 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 2872 | 2872 | $data['center_latitude'] = $latitude; |
| 2873 | 2873 | $data['center_longitude'] = $longitude; |
| 2874 | 2874 | $data['radius'] = intval($radius); |
| 2875 | 2875 | |
| 2876 | - preg_match(':<pre>(.*?)</pre>:',$description,$match); |
|
| 2876 | + preg_match(':<pre>(.*?)</pre>:', $description, $match); |
|
| 2877 | 2877 | $data['text'] = $match[1]; |
| 2878 | - preg_match(':</pre>(.*?)$:',$description,$match); |
|
| 2878 | + preg_match(':</pre>(.*?)$:', $description, $match); |
|
| 2879 | 2879 | $fromto = $match[1]; |
| 2880 | - preg_match('#FROM:(.*?)TO:#',$fromto,$match); |
|
| 2880 | + preg_match('#FROM:(.*?)TO:#', $fromto, $match); |
|
| 2881 | 2881 | $fromall = trim($match[1]); |
| 2882 | - preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match); |
|
| 2882 | + preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match); |
|
| 2883 | 2883 | $from = trim($match[1]); |
| 2884 | - $data['date_begin'] = date("Y-m-d H:i:s",strtotime($from)); |
|
| 2885 | - preg_match('#TO:(.*?)$#',$fromto,$match); |
|
| 2884 | + $data['date_begin'] = date("Y-m-d H:i:s", strtotime($from)); |
|
| 2885 | + preg_match('#TO:(.*?)$#', $fromto, $match); |
|
| 2886 | 2886 | $toall = trim($match[1]); |
| 2887 | - if (!preg_match(':Permanent:',$toall)) { |
|
| 2888 | - preg_match('#^(.*?) \((.*?)\)#',$toall,$match); |
|
| 2887 | + if (!preg_match(':Permanent:', $toall)) { |
|
| 2888 | + preg_match('#^(.*?) \((.*?)\)#', $toall, $match); |
|
| 2889 | 2889 | $to = trim($match[1]); |
| 2890 | - $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
|
| 2890 | + $data['date_end'] = date("Y-m-d H:i:s", strtotime($to)); |
|
| 2891 | 2891 | $data['permanent'] = 0; |
| 2892 | 2892 | } else { |
| 2893 | 2893 | $data['date_end'] = NULL; |
@@ -2895,7 +2895,7 @@ discard block |
||
| 2895 | 2895 | } |
| 2896 | 2896 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2897 | 2897 | $NOTAM = new NOTAM(); |
| 2898 | - $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']); |
|
| 2898 | + $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']); |
|
| 2899 | 2899 | unset($data); |
| 2900 | 2900 | } |
| 2901 | 2901 | } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
@@ -2918,16 +2918,16 @@ discard block |
||
| 2918 | 2918 | $Connection = new Connection(); |
| 2919 | 2919 | $sth = $Connection->db->prepare($query); |
| 2920 | 2920 | $sth->execute(); |
| 2921 | - } catch(PDOException $e) { |
|
| 2921 | + } catch (PDOException $e) { |
|
| 2922 | 2922 | return "error : ".$e->getMessage(); |
| 2923 | 2923 | } |
| 2924 | 2924 | } |
| 2925 | 2925 | $Common = new Common(); |
| 2926 | 2926 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 2927 | - $airspace_json = json_decode($airspace_lst,true); |
|
| 2927 | + $airspace_json = json_decode($airspace_lst, true); |
|
| 2928 | 2928 | foreach ($airspace_json['records'] as $airspace) { |
| 2929 | 2929 | if ($globalDebug) echo $airspace['name']."...\n"; |
| 2930 | - update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
|
| 2930 | + update_db::download($airspace['uri'], $tmp_dir.$airspace['name']); |
|
| 2931 | 2931 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 2932 | 2932 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
| 2933 | 2933 | //system('recode l9..utf8 '.$tmp_dir.$airspace['name']); |
@@ -2949,7 +2949,7 @@ discard block |
||
| 2949 | 2949 | $Connection = new Connection(); |
| 2950 | 2950 | $sth = $Connection->db->prepare($query); |
| 2951 | 2951 | $sth->execute(array(':new' => $new, ':old' => $old)); |
| 2952 | - } catch(PDOException $e) { |
|
| 2952 | + } catch (PDOException $e) { |
|
| 2953 | 2953 | return "error : ".$e->getMessage(); |
| 2954 | 2954 | } |
| 2955 | 2955 | } |
@@ -2966,7 +2966,7 @@ discard block |
||
| 2966 | 2966 | $Connection = new Connection(); |
| 2967 | 2967 | $sth = $Connection->db->prepare($query); |
| 2968 | 2968 | $sth->execute(); |
| 2969 | - } catch(PDOException $e) { |
|
| 2969 | + } catch (PDOException $e) { |
|
| 2970 | 2970 | return "error : ".$e->getMessage(); |
| 2971 | 2971 | } |
| 2972 | 2972 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2981,7 +2981,7 @@ discard block |
||
| 2981 | 2981 | $Connection = new Connection(); |
| 2982 | 2982 | $sth = $Connection->db->prepare($query); |
| 2983 | 2983 | $sth->execute(); |
| 2984 | - } catch(PDOException $e) { |
|
| 2984 | + } catch (PDOException $e) { |
|
| 2985 | 2985 | return "error : ".$e->getMessage(); |
| 2986 | 2986 | } |
| 2987 | 2987 | } |
@@ -2992,7 +2992,7 @@ discard block |
||
| 2992 | 2992 | $Connection = new Connection(); |
| 2993 | 2993 | $sth = $Connection->db->prepare($query); |
| 2994 | 2994 | $sth->execute(array(':version' => $version)); |
| 2995 | - } catch(PDOException $e) { |
|
| 2995 | + } catch (PDOException $e) { |
|
| 2996 | 2996 | return "error : ".$e->getMessage(); |
| 2997 | 2997 | } |
| 2998 | 2998 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3006,7 +3006,7 @@ discard block |
||
| 3006 | 3006 | $Connection = new Connection(); |
| 3007 | 3007 | $sth = $Connection->db->prepare($query); |
| 3008 | 3008 | $sth->execute(array(':version' => $version)); |
| 3009 | - } catch(PDOException $e) { |
|
| 3009 | + } catch (PDOException $e) { |
|
| 3010 | 3010 | return "error : ".$e->getMessage(); |
| 3011 | 3011 | } |
| 3012 | 3012 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3020,7 +3020,7 @@ discard block |
||
| 3020 | 3020 | $Connection = new Connection(); |
| 3021 | 3021 | $sth = $Connection->db->prepare($query); |
| 3022 | 3022 | $sth->execute(array(':version' => $version)); |
| 3023 | - } catch(PDOException $e) { |
|
| 3023 | + } catch (PDOException $e) { |
|
| 3024 | 3024 | return "error : ".$e->getMessage(); |
| 3025 | 3025 | } |
| 3026 | 3026 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3034,7 +3034,7 @@ discard block |
||
| 3034 | 3034 | $Connection = new Connection(); |
| 3035 | 3035 | $sth = $Connection->db->prepare($query); |
| 3036 | 3036 | $sth->execute(array(':version' => $version)); |
| 3037 | - } catch(PDOException $e) { |
|
| 3037 | + } catch (PDOException $e) { |
|
| 3038 | 3038 | return "error : ".$e->getMessage(); |
| 3039 | 3039 | } |
| 3040 | 3040 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3048,7 +3048,7 @@ discard block |
||
| 3048 | 3048 | $Connection = new Connection(); |
| 3049 | 3049 | $sth = $Connection->db->prepare($query); |
| 3050 | 3050 | $sth->execute(array(':version' => $version)); |
| 3051 | - } catch(PDOException $e) { |
|
| 3051 | + } catch (PDOException $e) { |
|
| 3052 | 3052 | return "error : ".$e->getMessage(); |
| 3053 | 3053 | } |
| 3054 | 3054 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3062,7 +3062,7 @@ discard block |
||
| 3062 | 3062 | $Connection = new Connection(); |
| 3063 | 3063 | $sth = $Connection->db->prepare($query); |
| 3064 | 3064 | $sth->execute(array(':version' => $version)); |
| 3065 | - } catch(PDOException $e) { |
|
| 3065 | + } catch (PDOException $e) { |
|
| 3066 | 3066 | return "error : ".$e->getMessage(); |
| 3067 | 3067 | } |
| 3068 | 3068 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3077,7 +3077,7 @@ discard block |
||
| 3077 | 3077 | $Connection = new Connection(); |
| 3078 | 3078 | $sth = $Connection->db->prepare($query); |
| 3079 | 3079 | $sth->execute(array(':version' => $version)); |
| 3080 | - } catch(PDOException $e) { |
|
| 3080 | + } catch (PDOException $e) { |
|
| 3081 | 3081 | return "error : ".$e->getMessage(); |
| 3082 | 3082 | } |
| 3083 | 3083 | } |
@@ -3089,7 +3089,7 @@ discard block |
||
| 3089 | 3089 | $Connection = new Connection(); |
| 3090 | 3090 | $sth = $Connection->db->prepare($query); |
| 3091 | 3091 | $sth->execute(array(':version' => $version)); |
| 3092 | - } catch(PDOException $e) { |
|
| 3092 | + } catch (PDOException $e) { |
|
| 3093 | 3093 | return "error : ".$e->getMessage(); |
| 3094 | 3094 | } |
| 3095 | 3095 | } |
@@ -3101,7 +3101,7 @@ discard block |
||
| 3101 | 3101 | $Connection = new Connection(); |
| 3102 | 3102 | $sth = $Connection->db->prepare($query); |
| 3103 | 3103 | $sth->execute(array(':version' => $version)); |
| 3104 | - } catch(PDOException $e) { |
|
| 3104 | + } catch (PDOException $e) { |
|
| 3105 | 3105 | return "error : ".$e->getMessage(); |
| 3106 | 3106 | } |
| 3107 | 3107 | } |
@@ -3113,7 +3113,7 @@ discard block |
||
| 3113 | 3113 | $Connection = new Connection(); |
| 3114 | 3114 | $sth = $Connection->db->prepare($query); |
| 3115 | 3115 | $sth->execute(array(':version' => $version)); |
| 3116 | - } catch(PDOException $e) { |
|
| 3116 | + } catch (PDOException $e) { |
|
| 3117 | 3117 | return "error : ".$e->getMessage(); |
| 3118 | 3118 | } |
| 3119 | 3119 | } |
@@ -3125,7 +3125,7 @@ discard block |
||
| 3125 | 3125 | $Connection = new Connection(); |
| 3126 | 3126 | $sth = $Connection->db->prepare($query); |
| 3127 | 3127 | $sth->execute(array(':version' => $version)); |
| 3128 | - } catch(PDOException $e) { |
|
| 3128 | + } catch (PDOException $e) { |
|
| 3129 | 3129 | return "error : ".$e->getMessage(); |
| 3130 | 3130 | } |
| 3131 | 3131 | } |
@@ -3137,7 +3137,7 @@ discard block |
||
| 3137 | 3137 | $Connection = new Connection(); |
| 3138 | 3138 | $sth = $Connection->db->prepare($query); |
| 3139 | 3139 | $sth->execute(array(':version' => $version)); |
| 3140 | - } catch(PDOException $e) { |
|
| 3140 | + } catch (PDOException $e) { |
|
| 3141 | 3141 | return "error : ".$e->getMessage(); |
| 3142 | 3142 | } |
| 3143 | 3143 | } |
@@ -3153,7 +3153,7 @@ discard block |
||
| 3153 | 3153 | $Connection = new Connection(); |
| 3154 | 3154 | $sth = $Connection->db->prepare($query); |
| 3155 | 3155 | $sth->execute(); |
| 3156 | - } catch(PDOException $e) { |
|
| 3156 | + } catch (PDOException $e) { |
|
| 3157 | 3157 | return "error : ".$e->getMessage(); |
| 3158 | 3158 | } |
| 3159 | 3159 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3168,7 +3168,7 @@ discard block |
||
| 3168 | 3168 | $Connection = new Connection(); |
| 3169 | 3169 | $sth = $Connection->db->prepare($query); |
| 3170 | 3170 | $sth->execute(); |
| 3171 | - } catch(PDOException $e) { |
|
| 3171 | + } catch (PDOException $e) { |
|
| 3172 | 3172 | return "error : ".$e->getMessage(); |
| 3173 | 3173 | } |
| 3174 | 3174 | } |
@@ -3184,7 +3184,7 @@ discard block |
||
| 3184 | 3184 | $Connection = new Connection(); |
| 3185 | 3185 | $sth = $Connection->db->prepare($query); |
| 3186 | 3186 | $sth->execute(); |
| 3187 | - } catch(PDOException $e) { |
|
| 3187 | + } catch (PDOException $e) { |
|
| 3188 | 3188 | return "error : ".$e->getMessage(); |
| 3189 | 3189 | } |
| 3190 | 3190 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3199,7 +3199,7 @@ discard block |
||
| 3199 | 3199 | $Connection = new Connection(); |
| 3200 | 3200 | $sth = $Connection->db->prepare($query); |
| 3201 | 3201 | $sth->execute(); |
| 3202 | - } catch(PDOException $e) { |
|
| 3202 | + } catch (PDOException $e) { |
|
| 3203 | 3203 | return "error : ".$e->getMessage(); |
| 3204 | 3204 | } |
| 3205 | 3205 | } |
@@ -3215,7 +3215,7 @@ discard block |
||
| 3215 | 3215 | $Connection = new Connection(); |
| 3216 | 3216 | $sth = $Connection->db->prepare($query); |
| 3217 | 3217 | $sth->execute(); |
| 3218 | - } catch(PDOException $e) { |
|
| 3218 | + } catch (PDOException $e) { |
|
| 3219 | 3219 | return "error : ".$e->getMessage(); |
| 3220 | 3220 | } |
| 3221 | 3221 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3230,7 +3230,7 @@ discard block |
||
| 3230 | 3230 | $Connection = new Connection(); |
| 3231 | 3231 | $sth = $Connection->db->prepare($query); |
| 3232 | 3232 | $sth->execute(); |
| 3233 | - } catch(PDOException $e) { |
|
| 3233 | + } catch (PDOException $e) { |
|
| 3234 | 3234 | return "error : ".$e->getMessage(); |
| 3235 | 3235 | } |
| 3236 | 3236 | } |
@@ -3246,7 +3246,7 @@ discard block |
||
| 3246 | 3246 | $Connection = new Connection(); |
| 3247 | 3247 | $sth = $Connection->db->prepare($query); |
| 3248 | 3248 | $sth->execute(); |
| 3249 | - } catch(PDOException $e) { |
|
| 3249 | + } catch (PDOException $e) { |
|
| 3250 | 3250 | return "error : ".$e->getMessage(); |
| 3251 | 3251 | } |
| 3252 | 3252 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3261,7 +3261,7 @@ discard block |
||
| 3261 | 3261 | $Connection = new Connection(); |
| 3262 | 3262 | $sth = $Connection->db->prepare($query); |
| 3263 | 3263 | $sth->execute(); |
| 3264 | - } catch(PDOException $e) { |
|
| 3264 | + } catch (PDOException $e) { |
|
| 3265 | 3265 | return "error : ".$e->getMessage(); |
| 3266 | 3266 | } |
| 3267 | 3267 | } |
@@ -3277,7 +3277,7 @@ discard block |
||
| 3277 | 3277 | $Connection = new Connection(); |
| 3278 | 3278 | $sth = $Connection->db->prepare($query); |
| 3279 | 3279 | $sth->execute(); |
| 3280 | - } catch(PDOException $e) { |
|
| 3280 | + } catch (PDOException $e) { |
|
| 3281 | 3281 | return "error : ".$e->getMessage(); |
| 3282 | 3282 | } |
| 3283 | 3283 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3292,7 +3292,7 @@ discard block |
||
| 3292 | 3292 | $Connection = new Connection(); |
| 3293 | 3293 | $sth = $Connection->db->prepare($query); |
| 3294 | 3294 | $sth->execute(); |
| 3295 | - } catch(PDOException $e) { |
|
| 3295 | + } catch (PDOException $e) { |
|
| 3296 | 3296 | return "error : ".$e->getMessage(); |
| 3297 | 3297 | } |
| 3298 | 3298 | } |
@@ -3308,7 +3308,7 @@ discard block |
||
| 3308 | 3308 | $Connection = new Connection(); |
| 3309 | 3309 | $sth = $Connection->db->prepare($query); |
| 3310 | 3310 | $sth->execute(); |
| 3311 | - } catch(PDOException $e) { |
|
| 3311 | + } catch (PDOException $e) { |
|
| 3312 | 3312 | return "error : ".$e->getMessage(); |
| 3313 | 3313 | } |
| 3314 | 3314 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3323,7 +3323,7 @@ discard block |
||
| 3323 | 3323 | $Connection = new Connection(); |
| 3324 | 3324 | $sth = $Connection->db->prepare($query); |
| 3325 | 3325 | $sth->execute(); |
| 3326 | - } catch(PDOException $e) { |
|
| 3326 | + } catch (PDOException $e) { |
|
| 3327 | 3327 | return "error : ".$e->getMessage(); |
| 3328 | 3328 | } |
| 3329 | 3329 | } |
@@ -3339,7 +3339,7 @@ discard block |
||
| 3339 | 3339 | $Connection = new Connection(); |
| 3340 | 3340 | $sth = $Connection->db->prepare($query); |
| 3341 | 3341 | $sth->execute(); |
| 3342 | - } catch(PDOException $e) { |
|
| 3342 | + } catch (PDOException $e) { |
|
| 3343 | 3343 | return "error : ".$e->getMessage(); |
| 3344 | 3344 | } |
| 3345 | 3345 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3354,7 +3354,7 @@ discard block |
||
| 3354 | 3354 | $Connection = new Connection(); |
| 3355 | 3355 | $sth = $Connection->db->prepare($query); |
| 3356 | 3356 | $sth->execute(); |
| 3357 | - } catch(PDOException $e) { |
|
| 3357 | + } catch (PDOException $e) { |
|
| 3358 | 3358 | return "error : ".$e->getMessage(); |
| 3359 | 3359 | } |
| 3360 | 3360 | } |
@@ -3370,7 +3370,7 @@ discard block |
||
| 3370 | 3370 | $Connection = new Connection(); |
| 3371 | 3371 | $sth = $Connection->db->prepare($query); |
| 3372 | 3372 | $sth->execute(); |
| 3373 | - } catch(PDOException $e) { |
|
| 3373 | + } catch (PDOException $e) { |
|
| 3374 | 3374 | return "error : ".$e->getMessage(); |
| 3375 | 3375 | } |
| 3376 | 3376 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3385,7 +3385,7 @@ discard block |
||
| 3385 | 3385 | $Connection = new Connection(); |
| 3386 | 3386 | $sth = $Connection->db->prepare($query); |
| 3387 | 3387 | $sth->execute(); |
| 3388 | - } catch(PDOException $e) { |
|
| 3388 | + } catch (PDOException $e) { |
|
| 3389 | 3389 | return "error : ".$e->getMessage(); |
| 3390 | 3390 | } |
| 3391 | 3391 | } |
@@ -3401,7 +3401,7 @@ discard block |
||
| 3401 | 3401 | $Connection = new Connection(); |
| 3402 | 3402 | $sth = $Connection->db->prepare($query); |
| 3403 | 3403 | $sth->execute(); |
| 3404 | - } catch(PDOException $e) { |
|
| 3404 | + } catch (PDOException $e) { |
|
| 3405 | 3405 | return "error : ".$e->getMessage(); |
| 3406 | 3406 | } |
| 3407 | 3407 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3416,7 +3416,7 @@ discard block |
||
| 3416 | 3416 | $Connection = new Connection(); |
| 3417 | 3417 | $sth = $Connection->db->prepare($query); |
| 3418 | 3418 | $sth->execute(); |
| 3419 | - } catch(PDOException $e) { |
|
| 3419 | + } catch (PDOException $e) { |
|
| 3420 | 3420 | return "error : ".$e->getMessage(); |
| 3421 | 3421 | } |
| 3422 | 3422 | } |
@@ -3432,7 +3432,7 @@ discard block |
||
| 3432 | 3432 | $Connection = new Connection(); |
| 3433 | 3433 | $sth = $Connection->db->prepare($query); |
| 3434 | 3434 | $sth->execute(); |
| 3435 | - } catch(PDOException $e) { |
|
| 3435 | + } catch (PDOException $e) { |
|
| 3436 | 3436 | return "error : ".$e->getMessage(); |
| 3437 | 3437 | } |
| 3438 | 3438 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3451,7 +3451,7 @@ discard block |
||
| 3451 | 3451 | $Connection = new Connection(); |
| 3452 | 3452 | $sth = $Connection->db->prepare($query); |
| 3453 | 3453 | $sth->execute(); |
| 3454 | - } catch(PDOException $e) { |
|
| 3454 | + } catch (PDOException $e) { |
|
| 3455 | 3455 | return "error : ".$e->getMessage(); |
| 3456 | 3456 | } |
| 3457 | 3457 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3466,7 +3466,7 @@ discard block |
||
| 3466 | 3466 | $Connection = new Connection(); |
| 3467 | 3467 | $sth = $Connection->db->prepare($query); |
| 3468 | 3468 | $sth->execute(); |
| 3469 | - } catch(PDOException $e) { |
|
| 3469 | + } catch (PDOException $e) { |
|
| 3470 | 3470 | return "error : ".$e->getMessage(); |
| 3471 | 3471 | } |
| 3472 | 3472 | } |
@@ -3478,7 +3478,7 @@ discard block |
||
| 3478 | 3478 | $Connection = new Connection(); |
| 3479 | 3479 | $sth = $Connection->db->prepare($query); |
| 3480 | 3480 | $sth->execute(); |
| 3481 | - } catch(PDOException $e) { |
|
| 3481 | + } catch (PDOException $e) { |
|
| 3482 | 3482 | return "error : ".$e->getMessage(); |
| 3483 | 3483 | } |
| 3484 | 3484 | } |
@@ -3494,7 +3494,7 @@ discard block |
||
| 3494 | 3494 | $Connection = new Connection(); |
| 3495 | 3495 | $sth = $Connection->db->prepare($query); |
| 3496 | 3496 | $sth->execute(); |
| 3497 | - } catch(PDOException $e) { |
|
| 3497 | + } catch (PDOException $e) { |
|
| 3498 | 3498 | return "error : ".$e->getMessage(); |
| 3499 | 3499 | } |
| 3500 | 3500 | } |
@@ -3509,7 +3509,7 @@ discard block |
||
| 3509 | 3509 | $Connection = new Connection(); |
| 3510 | 3510 | $sth = $Connection->db->prepare($query); |
| 3511 | 3511 | $sth->execute(); |
| 3512 | - } catch(PDOException $e) { |
|
| 3512 | + } catch (PDOException $e) { |
|
| 3513 | 3513 | return "error : ".$e->getMessage(); |
| 3514 | 3514 | } |
| 3515 | 3515 | } |
@@ -14,82 +14,82 @@ discard block |
||
| 14 | 14 | * @param Array $filter the filter |
| 15 | 15 | * @return Array the SQL part |
| 16 | 16 | */ |
| 17 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 19 | 19 | $filters = array(); |
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 21 | 21 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 22 | 22 | $filters = $globalStatsFilters[$globalFilterName]; |
| 23 | 23 | } else { |
| 24 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 24 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | if (isset($filter[0]['source'])) { |
| 28 | - $filters = array_merge($filters,$filter); |
|
| 28 | + $filters = array_merge($filters, $filter); |
|
| 29 | 29 | } |
| 30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 30 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 31 | 31 | $filter_query_join = ''; |
| 32 | 32 | $filter_query_where = ''; |
| 33 | - foreach($filters as $flt) { |
|
| 33 | + foreach ($filters as $flt) { |
|
| 34 | 34 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 35 | 35 | if ($flt['airlines'][0] != '') { |
| 36 | 36 | if (isset($flt['source'])) { |
| 37 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 37 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 38 | 38 | } else { |
| 39 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 39 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 44 | 44 | if (isset($flt['source'])) { |
| 45 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | 46 | } else { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 51 | 51 | if (isset($flt['source'])) { |
| 52 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | 53 | } else { |
| 54 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 58 | 58 | if (isset($flt['source'])) { |
| 59 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | 60 | } else { |
| 61 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 65 | 65 | if (isset($flt['source'])) { |
| 66 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 71 | 71 | if ($filter['airlines'][0] != '') { |
| 72 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 72 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 76 | 76 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | 82 | if (count($filter['source']) == 1) { |
| 83 | 83 | $filter_query_where .= " AND format_source = '".$filter['source'][0]."'"; |
| 84 | 84 | } else { |
| 85 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 85 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 89 | 89 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
| 90 | 90 | } |
| 91 | 91 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 92 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 92 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 93 | 93 | } |
| 94 | 94 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 95 | 95 | $filter_query_date = ''; |
@@ -114,41 +114,41 @@ discard block |
||
| 114 | 114 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 117 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 118 | 118 | } |
| 119 | 119 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 120 | 120 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 121 | 121 | if ($filter_query_where != '') { |
| 122 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 122 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 123 | 123 | } |
| 124 | 124 | $filter_query = $filter_query_join.$filter_query_where; |
| 125 | 125 | return $filter_query; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | // Spotter_archive |
| 129 | - public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
|
| 129 | + public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') { |
|
| 130 | 130 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 131 | 131 | if ($over_country == '') { |
| 132 | 132 | $Spotter = new Spotter($this->db); |
| 133 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 133 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 134 | 134 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 135 | 135 | else $country = ''; |
| 136 | 136 | } else $country = $over_country; |
| 137 | - if ($airline_type === NULL) $airline_type =''; |
|
| 137 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 138 | 138 | |
| 139 | 139 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 140 | 140 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 141 | 141 | |
| 142 | 142 | // Route is not added in spotter_archive |
| 143 | - $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 143 | + $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 144 | 144 | VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)"; |
| 145 | 145 | |
| 146 | - $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude); |
|
| 146 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude); |
|
| 147 | 147 | try { |
| 148 | 148 | $sth = $this->db->prepare($query); |
| 149 | 149 | $sth->execute($query_values); |
| 150 | 150 | $sth->closeCursor(); |
| 151 | - } catch(PDOException $e) { |
|
| 151 | + } catch (PDOException $e) { |
|
| 152 | 152 | return "error : ".$e->getMessage(); |
| 153 | 153 | } |
| 154 | 154 | return "success"; |
@@ -168,9 +168,9 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 170 | 170 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 171 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 171 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 172 | 172 | |
| 173 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 173 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 174 | 174 | |
| 175 | 175 | return $spotter_array; |
| 176 | 176 | } |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 190 | 190 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 191 | 191 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 192 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 192 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 193 | 193 | |
| 194 | 194 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 195 | 195 | /* |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | } |
| 203 | 203 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 204 | 204 | */ |
| 205 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 205 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 206 | 206 | |
| 207 | 207 | return $spotter_array; |
| 208 | 208 | } |
@@ -217,14 +217,14 @@ discard block |
||
| 217 | 217 | { |
| 218 | 218 | date_default_timezone_set('UTC'); |
| 219 | 219 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 220 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 220 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 221 | 221 | |
| 222 | 222 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 223 | 223 | |
| 224 | 224 | try { |
| 225 | 225 | $sth = $this->db->prepare($query); |
| 226 | 226 | $sth->execute(array(':id' => $id)); |
| 227 | - } catch(PDOException $e) { |
|
| 227 | + } catch (PDOException $e) { |
|
| 228 | 228 | echo $e->getMessage(); |
| 229 | 229 | die; |
| 230 | 230 | } |
@@ -243,14 +243,14 @@ discard block |
||
| 243 | 243 | { |
| 244 | 244 | date_default_timezone_set('UTC'); |
| 245 | 245 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 246 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 246 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 247 | 247 | |
| 248 | 248 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 249 | 249 | |
| 250 | 250 | try { |
| 251 | 251 | $sth = $this->db->prepare($query); |
| 252 | 252 | $sth->execute(array(':id' => $id)); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch (PDOException $e) { |
|
| 254 | 254 | echo $e->getMessage(); |
| 255 | 255 | die; |
| 256 | 256 | } |
@@ -272,12 +272,12 @@ discard block |
||
| 272 | 272 | date_default_timezone_set('UTC'); |
| 273 | 273 | |
| 274 | 274 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 275 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 275 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 276 | 276 | |
| 277 | 277 | try { |
| 278 | 278 | $sth = $this->db->prepare($query); |
| 279 | 279 | $sth->execute(array(':ident' => $ident)); |
| 280 | - } catch(PDOException $e) { |
|
| 280 | + } catch (PDOException $e) { |
|
| 281 | 281 | echo $e->getMessage(); |
| 282 | 282 | die; |
| 283 | 283 | } |
@@ -298,12 +298,12 @@ discard block |
||
| 298 | 298 | date_default_timezone_set('UTC'); |
| 299 | 299 | |
| 300 | 300 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 301 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 301 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 302 | 302 | |
| 303 | 303 | try { |
| 304 | 304 | $sth = $this->db->prepare($query); |
| 305 | 305 | $sth->execute(array(':id' => $id)); |
| 306 | - } catch(PDOException $e) { |
|
| 306 | + } catch (PDOException $e) { |
|
| 307 | 307 | echo $e->getMessage(); |
| 308 | 308 | die; |
| 309 | 309 | } |
@@ -322,11 +322,11 @@ discard block |
||
| 322 | 322 | { |
| 323 | 323 | date_default_timezone_set('UTC'); |
| 324 | 324 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 325 | - $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 325 | + $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 326 | 326 | try { |
| 327 | 327 | $sth = $this->db->prepare($query); |
| 328 | 328 | $sth->execute(array(':id' => $id)); |
| 329 | - } catch(PDOException $e) { |
|
| 329 | + } catch (PDOException $e) { |
|
| 330 | 330 | echo $e->getMessage(); |
| 331 | 331 | die; |
| 332 | 332 | } |
@@ -344,12 +344,12 @@ discard block |
||
| 344 | 344 | { |
| 345 | 345 | date_default_timezone_set('UTC'); |
| 346 | 346 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 347 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 347 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 348 | 348 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 349 | 349 | try { |
| 350 | 350 | $sth = $this->db->prepare($query); |
| 351 | 351 | $sth->execute(array(':ident' => $ident)); |
| 352 | - } catch(PDOException $e) { |
|
| 352 | + } catch (PDOException $e) { |
|
| 353 | 353 | echo $e->getMessage(); |
| 354 | 354 | die; |
| 355 | 355 | } |
@@ -365,12 +365,12 @@ discard block |
||
| 365 | 365 | * @return Array the spotter information |
| 366 | 366 | * |
| 367 | 367 | */ |
| 368 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 368 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) |
|
| 369 | 369 | { |
| 370 | 370 | $Spotter = new Spotter($this->db); |
| 371 | 371 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 372 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 373 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 372 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 373 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 374 | 374 | return $spotter_array; |
| 375 | 375 | } |
| 376 | 376 | |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | try { |
| 386 | 386 | $sth = $this->db->prepare($query); |
| 387 | 387 | $sth->execute(); |
| 388 | - } catch(PDOException $e) { |
|
| 388 | + } catch (PDOException $e) { |
|
| 389 | 389 | echo $e->getMessage(); |
| 390 | 390 | die; |
| 391 | 391 | } |
@@ -397,24 +397,24 @@ discard block |
||
| 397 | 397 | * @return Array the spotter information |
| 398 | 398 | * |
| 399 | 399 | */ |
| 400 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 400 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) |
|
| 401 | 401 | { |
| 402 | 402 | global $globalDBdriver, $globalLiveInterval; |
| 403 | 403 | date_default_timezone_set('UTC'); |
| 404 | 404 | |
| 405 | 405 | $filter_query = ''; |
| 406 | 406 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 407 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 407 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 408 | 408 | } |
| 409 | 409 | // Use spotter_output also ? |
| 410 | 410 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 411 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 411 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 412 | 412 | } |
| 413 | 413 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 414 | 414 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 415 | 415 | } |
| 416 | 416 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 417 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 417 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -433,14 +433,14 @@ discard block |
||
| 433 | 433 | GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id |
| 434 | 434 | AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 435 | 435 | */ |
| 436 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 436 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 437 | 437 | FROM spotter_archive |
| 438 | 438 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 439 | 439 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 440 | 440 | '.$filter_query.' ORDER BY flightaware_id'; |
| 441 | 441 | } else { |
| 442 | 442 | //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
| 443 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 443 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 444 | 444 | FROM spotter_archive |
| 445 | 445 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 446 | 446 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | try { |
| 451 | 451 | $sth = $this->db->prepare($query); |
| 452 | 452 | $sth->execute(); |
| 453 | - } catch(PDOException $e) { |
|
| 453 | + } catch (PDOException $e) { |
|
| 454 | 454 | echo $e->getMessage(); |
| 455 | 455 | die; |
| 456 | 456 | } |
@@ -465,24 +465,24 @@ discard block |
||
| 465 | 465 | * @return Array the spotter information |
| 466 | 466 | * |
| 467 | 467 | */ |
| 468 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 468 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) |
|
| 469 | 469 | { |
| 470 | 470 | global $globalDBdriver, $globalLiveInterval; |
| 471 | 471 | date_default_timezone_set('UTC'); |
| 472 | 472 | |
| 473 | 473 | $filter_query = ''; |
| 474 | 474 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 475 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 475 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 476 | 476 | } |
| 477 | 477 | // Should use spotter_output also ? |
| 478 | 478 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 479 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 479 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 480 | 480 | } |
| 481 | 481 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 482 | 482 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 483 | 483 | } |
| 484 | 484 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 485 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 485 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | FROM spotter_archive |
| 493 | 493 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 494 | 494 | */ |
| 495 | - $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 495 | + $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 496 | 496 | FROM spotter_archive_output |
| 497 | 497 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 498 | 498 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 508 | 508 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 509 | 509 | */ |
| 510 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 510 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 511 | 511 | FROM spotter_archive_output |
| 512 | 512 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 513 | 513 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | try { |
| 520 | 520 | $sth = $this->db->prepare($query); |
| 521 | 521 | $sth->execute(); |
| 522 | - } catch(PDOException $e) { |
|
| 522 | + } catch (PDOException $e) { |
|
| 523 | 523 | echo $e->getMessage(); |
| 524 | 524 | die; |
| 525 | 525 | } |
@@ -534,23 +534,23 @@ discard block |
||
| 534 | 534 | * @return Array the spotter information |
| 535 | 535 | * |
| 536 | 536 | */ |
| 537 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 537 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) |
|
| 538 | 538 | { |
| 539 | 539 | global $globalDBdriver, $globalLiveInterval; |
| 540 | 540 | date_default_timezone_set('UTC'); |
| 541 | 541 | |
| 542 | 542 | $filter_query = ''; |
| 543 | 543 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 544 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 544 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 545 | 545 | } |
| 546 | 546 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 547 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 547 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 548 | 548 | } |
| 549 | 549 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 550 | 550 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 551 | 551 | } |
| 552 | 552 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 553 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 553 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 554 | 554 | } |
| 555 | 555 | |
| 556 | 556 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | try { |
| 566 | 566 | $sth = $this->db->prepare($query); |
| 567 | 567 | $sth->execute(); |
| 568 | - } catch(PDOException $e) { |
|
| 568 | + } catch (PDOException $e) { |
|
| 569 | 569 | echo $e->getMessage(); |
| 570 | 570 | die; |
| 571 | 571 | } |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | * @return Array the spotter information |
| 586 | 586 | * |
| 587 | 587 | */ |
| 588 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 588 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 589 | 589 | { |
| 590 | 590 | global $globalTimezone, $globalDBdriver; |
| 591 | 591 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | |
| 608 | 608 | $q_array = explode(" ", $q); |
| 609 | 609 | |
| 610 | - foreach ($q_array as $q_item){ |
|
| 610 | + foreach ($q_array as $q_item) { |
|
| 611 | 611 | $additional_query .= " AND ("; |
| 612 | 612 | $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 613 | 613 | $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | |
| 640 | 640 | if ($registration != "") |
| 641 | 641 | { |
| 642 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 642 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 643 | 643 | if (!is_string($registration)) |
| 644 | 644 | { |
| 645 | 645 | return false; |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | if ($aircraft_icao != "") |
| 652 | 652 | { |
| 653 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 653 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 654 | 654 | if (!is_string($aircraft_icao)) |
| 655 | 655 | { |
| 656 | 656 | return false; |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | |
| 662 | 662 | if ($aircraft_manufacturer != "") |
| 663 | 663 | { |
| 664 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 664 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 665 | 665 | if (!is_string($aircraft_manufacturer)) |
| 666 | 666 | { |
| 667 | 667 | return false; |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | if ($airline_icao != "") |
| 684 | 684 | { |
| 685 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 685 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 686 | 686 | if (!is_string($airline_icao)) |
| 687 | 687 | { |
| 688 | 688 | return false; |
@@ -693,7 +693,7 @@ discard block |
||
| 693 | 693 | |
| 694 | 694 | if ($airline_country != "") |
| 695 | 695 | { |
| 696 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 696 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 697 | 697 | if (!is_string($airline_country)) |
| 698 | 698 | { |
| 699 | 699 | return false; |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | |
| 705 | 705 | if ($airline_type != "") |
| 706 | 706 | { |
| 707 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 707 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 708 | 708 | if (!is_string($airline_type)) |
| 709 | 709 | { |
| 710 | 710 | return false; |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | |
| 727 | 727 | if ($airport != "") |
| 728 | 728 | { |
| 729 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 729 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 730 | 730 | if (!is_string($airport)) |
| 731 | 731 | { |
| 732 | 732 | return false; |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | |
| 738 | 738 | if ($airport_country != "") |
| 739 | 739 | { |
| 740 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 740 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 741 | 741 | if (!is_string($airport_country)) |
| 742 | 742 | { |
| 743 | 743 | return false; |
@@ -748,7 +748,7 @@ discard block |
||
| 748 | 748 | |
| 749 | 749 | if ($callsign != "") |
| 750 | 750 | { |
| 751 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 751 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 752 | 752 | if (!is_string($callsign)) |
| 753 | 753 | { |
| 754 | 754 | return false; |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | $translate = $Translation->ident2icao($callsign); |
| 757 | 757 | if ($translate != $callsign) { |
| 758 | 758 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 759 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 759 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 760 | 760 | } else { |
| 761 | 761 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 762 | 762 | } |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | |
| 766 | 766 | if ($owner != "") |
| 767 | 767 | { |
| 768 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 768 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 769 | 769 | if (!is_string($owner)) |
| 770 | 770 | { |
| 771 | 771 | return false; |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | |
| 777 | 777 | if ($pilot_name != "") |
| 778 | 778 | { |
| 779 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 779 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 780 | 780 | if (!is_string($pilot_name)) |
| 781 | 781 | { |
| 782 | 782 | return false; |
@@ -787,7 +787,7 @@ discard block |
||
| 787 | 787 | |
| 788 | 788 | if ($pilot_id != "") |
| 789 | 789 | { |
| 790 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 790 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 791 | 791 | if (!is_string($pilot_id)) |
| 792 | 792 | { |
| 793 | 793 | return false; |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | |
| 799 | 799 | if ($departure_airport_route != "") |
| 800 | 800 | { |
| 801 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 801 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 802 | 802 | if (!is_string($departure_airport_route)) |
| 803 | 803 | { |
| 804 | 804 | return false; |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | |
| 810 | 810 | if ($arrival_airport_route != "") |
| 811 | 811 | { |
| 812 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 812 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 813 | 813 | if (!is_string($arrival_airport_route)) |
| 814 | 814 | { |
| 815 | 815 | return false; |
@@ -822,8 +822,8 @@ discard block |
||
| 822 | 822 | { |
| 823 | 823 | $altitude_array = explode(",", $altitude); |
| 824 | 824 | |
| 825 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 826 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 825 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 826 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 827 | 827 | |
| 828 | 828 | |
| 829 | 829 | if ($altitude_array[1] != "") |
@@ -840,8 +840,8 @@ discard block |
||
| 840 | 840 | if ($date_posted != "") |
| 841 | 841 | { |
| 842 | 842 | $date_array = explode(",", $date_posted); |
| 843 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 844 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 843 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 844 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 845 | 845 | if ($globalTimezone != '') { |
| 846 | 846 | date_default_timezone_set($globalTimezone); |
| 847 | 847 | $datetime = new DateTime(); |
@@ -868,8 +868,8 @@ discard block |
||
| 868 | 868 | if ($limit != "") |
| 869 | 869 | { |
| 870 | 870 | $limit_array = explode(",", $limit); |
| 871 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 872 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 871 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 872 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 873 | 873 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 874 | 874 | { |
| 875 | 875 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -877,8 +877,8 @@ discard block |
||
| 877 | 877 | } |
| 878 | 878 | } |
| 879 | 879 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 880 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 881 | - $query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 880 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 881 | + $query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 882 | 882 | FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 883 | 883 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 884 | 884 | } else { |
@@ -894,12 +894,12 @@ discard block |
||
| 894 | 894 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 895 | 895 | } |
| 896 | 896 | |
| 897 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 897 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 898 | 898 | WHERE spotter_archive_output.ident <> '' |
| 899 | 899 | ".$additional_query." |
| 900 | 900 | ".$filter_query.$orderby_query; |
| 901 | 901 | } |
| 902 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 902 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 903 | 903 | return $spotter_array; |
| 904 | 904 | } |
| 905 | 905 | |
@@ -914,7 +914,7 @@ discard block |
||
| 914 | 914 | try { |
| 915 | 915 | $sth = $this->db->prepare($query); |
| 916 | 916 | $sth->execute(); |
| 917 | - } catch(PDOException $e) { |
|
| 917 | + } catch (PDOException $e) { |
|
| 918 | 918 | return "error"; |
| 919 | 919 | } |
| 920 | 920 | } |
@@ -951,8 +951,8 @@ discard block |
||
| 951 | 951 | { |
| 952 | 952 | $limit_array = explode(",", $limit); |
| 953 | 953 | |
| 954 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 955 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 954 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 955 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 956 | 956 | |
| 957 | 957 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 958 | 958 | { |
@@ -993,7 +993,7 @@ discard block |
||
| 993 | 993 | $query_values = array(); |
| 994 | 994 | $limit_query = ''; |
| 995 | 995 | $additional_query = ''; |
| 996 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 996 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 997 | 997 | |
| 998 | 998 | if ($owner != "") |
| 999 | 999 | { |
@@ -1010,8 +1010,8 @@ discard block |
||
| 1010 | 1010 | { |
| 1011 | 1011 | $limit_array = explode(",", $limit); |
| 1012 | 1012 | |
| 1013 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1014 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1013 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1014 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1015 | 1015 | |
| 1016 | 1016 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1017 | 1017 | { |
@@ -1051,7 +1051,7 @@ discard block |
||
| 1051 | 1051 | $query_values = array(); |
| 1052 | 1052 | $limit_query = ''; |
| 1053 | 1053 | $additional_query = ''; |
| 1054 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1054 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1055 | 1055 | |
| 1056 | 1056 | if ($pilot != "") |
| 1057 | 1057 | { |
@@ -1063,8 +1063,8 @@ discard block |
||
| 1063 | 1063 | { |
| 1064 | 1064 | $limit_array = explode(",", $limit); |
| 1065 | 1065 | |
| 1066 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1067 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1066 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1067 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1068 | 1068 | |
| 1069 | 1069 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1070 | 1070 | { |
@@ -1094,7 +1094,7 @@ discard block |
||
| 1094 | 1094 | * @return Array the airline country list |
| 1095 | 1095 | * |
| 1096 | 1096 | */ |
| 1097 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1097 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1098 | 1098 | { |
| 1099 | 1099 | global $globalDBdriver; |
| 1100 | 1100 | /* |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | $flight_array = array(); |
| 1124 | 1124 | $temp_array = array(); |
| 1125 | 1125 | |
| 1126 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1126 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1127 | 1127 | { |
| 1128 | 1128 | $temp_array['flight_count'] = $row['nb']; |
| 1129 | 1129 | $temp_array['flight_country'] = $row['name']; |
@@ -1140,7 +1140,7 @@ discard block |
||
| 1140 | 1140 | * @return Array the airline country list |
| 1141 | 1141 | * |
| 1142 | 1142 | */ |
| 1143 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1143 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1144 | 1144 | { |
| 1145 | 1145 | global $globalDBdriver; |
| 1146 | 1146 | /* |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | $flight_array = array(); |
| 1170 | 1170 | $temp_array = array(); |
| 1171 | 1171 | |
| 1172 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1172 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1173 | 1173 | { |
| 1174 | 1174 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1175 | 1175 | $temp_array['flight_count'] = $row['nb']; |
@@ -1187,14 +1187,14 @@ discard block |
||
| 1187 | 1187 | * @return Array the spotter information |
| 1188 | 1188 | * |
| 1189 | 1189 | */ |
| 1190 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1190 | + public function getDateArchiveSpotterDataById($id, $date) |
|
| 1191 | 1191 | { |
| 1192 | 1192 | $Spotter = new Spotter($this->db); |
| 1193 | 1193 | date_default_timezone_set('UTC'); |
| 1194 | 1194 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1195 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1196 | - $date = date('c',$date); |
|
| 1197 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1195 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1196 | + $date = date('c', $date); |
|
| 1197 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1198 | 1198 | return $spotter_array; |
| 1199 | 1199 | } |
| 1200 | 1200 | |
@@ -1204,14 +1204,14 @@ discard block |
||
| 1204 | 1204 | * @return Array the spotter information |
| 1205 | 1205 | * |
| 1206 | 1206 | */ |
| 1207 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1207 | + public function getDateArchiveSpotterDataByIdent($ident, $date) |
|
| 1208 | 1208 | { |
| 1209 | 1209 | $Spotter = new Spotter($this->db); |
| 1210 | 1210 | date_default_timezone_set('UTC'); |
| 1211 | 1211 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1212 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | - $date = date('c',$date); |
|
| 1214 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1212 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | + $date = date('c', $date); |
|
| 1214 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1215 | 1215 | return $spotter_array; |
| 1216 | 1216 | } |
| 1217 | 1217 | |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | * @return Array the spotter information |
| 1222 | 1222 | * |
| 1223 | 1223 | */ |
| 1224 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1224 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1225 | 1225 | { |
| 1226 | 1226 | global $global_query; |
| 1227 | 1227 | $Spotter = new Spotter($this->db); |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | $query_values = array(); |
| 1230 | 1230 | $limit_query = ''; |
| 1231 | 1231 | $additional_query = ''; |
| 1232 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1232 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1233 | 1233 | |
| 1234 | 1234 | if ($airport != "") |
| 1235 | 1235 | { |
@@ -1246,8 +1246,8 @@ discard block |
||
| 1246 | 1246 | { |
| 1247 | 1247 | $limit_array = explode(",", $limit); |
| 1248 | 1248 | |
| 1249 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1250 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1249 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1250 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1251 | 1251 | |
| 1252 | 1252 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1253 | 1253 | { |
@@ -17,62 +17,62 @@ discard block |
||
| 17 | 17 | * @param Array $filter the filter |
| 18 | 18 | * @return Array the SQL part |
| 19 | 19 | */ |
| 20 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 20 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 21 | 21 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 22 | 22 | $filters = array(); |
| 23 | 23 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 24 | 24 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 25 | 25 | $filters = $globalStatsFilters[$globalFilterName]; |
| 26 | 26 | } else { |
| 27 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 27 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | if (isset($filter[0]['source'])) { |
| 31 | - $filters = array_merge($filters,$filter); |
|
| 31 | + $filters = array_merge($filters, $filter); |
|
| 32 | 32 | } |
| 33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 33 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 34 | 34 | $filter_query_join = ''; |
| 35 | 35 | $filter_query_where = ''; |
| 36 | - foreach($filters as $flt) { |
|
| 36 | + foreach ($filters as $flt) { |
|
| 37 | 37 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 38 | 38 | if ($flt['airlines'][0] != '') { |
| 39 | 39 | if (isset($flt['source'])) { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 41 | 41 | } else { |
| 42 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 42 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 47 | 47 | if (isset($flt['source'])) { |
| 48 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 48 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 49 | 49 | } else { |
| 50 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 50 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 54 | 54 | if (isset($flt['source'])) { |
| 55 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 55 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 56 | 56 | } else { |
| 57 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 57 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 61 | 61 | if (isset($flt['source'])) { |
| 62 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 62 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 63 | 63 | } else { |
| 64 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 64 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 68 | 68 | if (isset($flt['source'])) { |
| 69 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 69 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 74 | 74 | if ($filter['airlines'][0] != '') { |
| 75 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 75 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['alliance']) && !empty($filter['alliance'])) { |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 85 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 85 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 88 | 88 | if (count($filter['source']) == 1) { |
| 89 | 89 | $filter_query_where .= " AND format_source = '".$filter['source'][0]."'"; |
| 90 | 90 | } else { |
| 91 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 91 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
@@ -118,15 +118,15 @@ discard block |
||
| 118 | 118 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'"; |
| 119 | 119 | } |
| 120 | 120 | } |
| 121 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 121 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 122 | 122 | } |
| 123 | 123 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 124 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 124 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 125 | 125 | } |
| 126 | 126 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 127 | 127 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 128 | 128 | if ($filter_query_where != '') { |
| 129 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 129 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 130 | 130 | } |
| 131 | 131 | $filter_query = $filter_query_join.$filter_query_where; |
| 132 | 132 | return $filter_query; |
@@ -149,8 +149,8 @@ discard block |
||
| 149 | 149 | if ($limit != '') |
| 150 | 150 | { |
| 151 | 151 | $limit_array = explode(',', $limit); |
| 152 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 153 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 152 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 153 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 154 | 154 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 155 | 155 | { |
| 156 | 156 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | } else { |
| 175 | 175 | $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query; |
| 176 | 176 | } |
| 177 | - $spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 177 | + $spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 178 | 178 | |
| 179 | 179 | return $spotter_array; |
| 180 | 180 | } |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | { |
| 190 | 190 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 191 | 191 | date_default_timezone_set('UTC'); |
| 192 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 192 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 193 | 193 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 194 | 194 | if ($globalDBdriver == 'mysql') { |
| 195 | 195 | if (isset($globalArchive) && $globalArchive === TRUE) { |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | try { |
| 213 | 213 | $sth = $this->db->prepare($query); |
| 214 | 214 | $sth->execute(); |
| 215 | - } catch(PDOException $e) { |
|
| 215 | + } catch (PDOException $e) { |
|
| 216 | 216 | echo $e->getMessage(); |
| 217 | 217 | die; |
| 218 | 218 | } |
@@ -226,19 +226,19 @@ discard block |
||
| 226 | 226 | * @return Array the spotter information |
| 227 | 227 | * |
| 228 | 228 | */ |
| 229 | - public function getMinLastLiveSpotterData($coord = array(),$filter = array(), $limit = false) |
|
| 229 | + public function getMinLastLiveSpotterData($coord = array(), $filter = array(), $limit = false) |
|
| 230 | 230 | { |
| 231 | 231 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit; |
| 232 | 232 | date_default_timezone_set('UTC'); |
| 233 | 233 | $usecoord = false; |
| 234 | 234 | if (is_array($coord) && !empty($coord)) { |
| 235 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 236 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 237 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 238 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 235 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 236 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 237 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 238 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 239 | 239 | $usecoord = true; |
| 240 | 240 | } |
| 241 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 241 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 242 | 242 | |
| 243 | 243 | if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200'; |
| 244 | 244 | if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300'; |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | try { |
| 300 | 300 | $sth = $this->db->prepare($query); |
| 301 | 301 | $sth->execute(); |
| 302 | - } catch(PDOException $e) { |
|
| 302 | + } catch (PDOException $e) { |
|
| 303 | 303 | echo $e->getMessage(); |
| 304 | 304 | die; |
| 305 | 305 | } |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | public function getLiveSpotterCount($filter = array()) |
| 317 | 317 | { |
| 318 | 318 | global $globalDBdriver, $globalLiveInterval; |
| 319 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 319 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 320 | 320 | |
| 321 | 321 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 322 | 322 | if ($globalDBdriver == 'mysql') { |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | try { |
| 330 | 330 | $sth = $this->db->prepare($query); |
| 331 | 331 | $sth->execute(); |
| 332 | - } catch(PDOException $e) { |
|
| 332 | + } catch (PDOException $e) { |
|
| 333 | 333 | echo $e->getMessage(); |
| 334 | 334 | die; |
| 335 | 335 | } |
@@ -352,10 +352,10 @@ discard block |
||
| 352 | 352 | $filter_query = $this->getFilter($filter); |
| 353 | 353 | |
| 354 | 354 | if (is_array($coord)) { |
| 355 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 356 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 357 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 358 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 355 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 356 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 357 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 358 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 359 | 359 | } else return array(); |
| 360 | 360 | if ($globalDBdriver == 'mysql') { |
| 361 | 361 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
@@ -378,23 +378,23 @@ discard block |
||
| 378 | 378 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 379 | 379 | $Spotter = new Spotter($this->db); |
| 380 | 380 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 381 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 381 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 382 | 382 | |
| 383 | 383 | if (is_array($coord)) { |
| 384 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 385 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 386 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 387 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 384 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 385 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 386 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 387 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 388 | 388 | } else return array(); |
| 389 | 389 | if ($globalDBdriver == 'mysql') { |
| 390 | 390 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 391 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 391 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 392 | 392 | FROM spotter_live |
| 393 | 393 | '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date |
| 394 | 394 | AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' |
| 395 | 395 | AND spotter_live.latitude <> 0 AND spotter_live.longitude <> 0'; |
| 396 | 396 | } else { |
| 397 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 397 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 398 | 398 | FROM spotter_live |
| 399 | 399 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 400 | 400 | FROM spotter_live l |
@@ -406,14 +406,14 @@ discard block |
||
| 406 | 406 | } |
| 407 | 407 | } else { |
| 408 | 408 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 409 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 409 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 410 | 410 | FROM spotter_live |
| 411 | 411 | ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date |
| 412 | 412 | AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." |
| 413 | 413 | AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." |
| 414 | 414 | AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 415 | 415 | } else { |
| 416 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 416 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 417 | 417 | FROM spotter_live |
| 418 | 418 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 419 | 419 | FROM spotter_live l |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | try { |
| 429 | 429 | $sth = $this->db->prepare($query); |
| 430 | 430 | $sth->execute(); |
| 431 | - } catch(PDOException $e) { |
|
| 431 | + } catch (PDOException $e) { |
|
| 432 | 432 | echo $e->getMessage(); |
| 433 | 433 | die; |
| 434 | 434 | } |
@@ -477,7 +477,7 @@ discard block |
||
| 477 | 477 | if ($interval == '1m') |
| 478 | 478 | { |
| 479 | 479 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 480 | - } else if ($interval == '15m'){ |
|
| 480 | + } else if ($interval == '15m') { |
|
| 481 | 481 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
| 482 | 482 | } |
| 483 | 483 | } |
@@ -485,14 +485,14 @@ discard block |
||
| 485 | 485 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 486 | 486 | } |
| 487 | 487 | |
| 488 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 488 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 489 | 489 | WHERE spotter_live.latitude <> '' |
| 490 | 490 | AND spotter_live.longitude <> '' |
| 491 | 491 | ".$additional_query." |
| 492 | 492 | HAVING distance < :radius |
| 493 | 493 | ORDER BY distance"; |
| 494 | 494 | |
| 495 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 495 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 496 | 496 | |
| 497 | 497 | return $spotter_array; |
| 498 | 498 | } |
@@ -510,9 +510,9 @@ discard block |
||
| 510 | 510 | date_default_timezone_set('UTC'); |
| 511 | 511 | |
| 512 | 512 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 513 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 513 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 514 | 514 | |
| 515 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 515 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 516 | 516 | |
| 517 | 517 | return $spotter_array; |
| 518 | 518 | } |
@@ -523,16 +523,16 @@ discard block |
||
| 523 | 523 | * @return Array the spotter information |
| 524 | 524 | * |
| 525 | 525 | */ |
| 526 | - public function getDateLiveSpotterDataByIdent($ident,$date) |
|
| 526 | + public function getDateLiveSpotterDataByIdent($ident, $date) |
|
| 527 | 527 | { |
| 528 | 528 | $Spotter = new Spotter($this->db); |
| 529 | 529 | date_default_timezone_set('UTC'); |
| 530 | 530 | |
| 531 | 531 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 532 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 532 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 533 | 533 | |
| 534 | - $date = date('c',$date); |
|
| 535 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 534 | + $date = date('c', $date); |
|
| 535 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 536 | 536 | |
| 537 | 537 | return $spotter_array; |
| 538 | 538 | } |
@@ -548,8 +548,8 @@ discard block |
||
| 548 | 548 | $Spotter = new Spotter($this->db); |
| 549 | 549 | date_default_timezone_set('UTC'); |
| 550 | 550 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 551 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 552 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 551 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 552 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 553 | 553 | return $spotter_array; |
| 554 | 554 | } |
| 555 | 555 | |
@@ -559,15 +559,15 @@ discard block |
||
| 559 | 559 | * @return Array the spotter information |
| 560 | 560 | * |
| 561 | 561 | */ |
| 562 | - public function getDateLiveSpotterDataById($id,$date) |
|
| 562 | + public function getDateLiveSpotterDataById($id, $date) |
|
| 563 | 563 | { |
| 564 | 564 | $Spotter = new Spotter($this->db); |
| 565 | 565 | date_default_timezone_set('UTC'); |
| 566 | 566 | |
| 567 | 567 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 568 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 569 | - $date = date('c',$date); |
|
| 570 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 568 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 569 | + $date = date('c', $date); |
|
| 570 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 571 | 571 | return $spotter_array; |
| 572 | 572 | } |
| 573 | 573 | |
@@ -583,13 +583,13 @@ discard block |
||
| 583 | 583 | date_default_timezone_set('UTC'); |
| 584 | 584 | |
| 585 | 585 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 586 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 586 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 587 | 587 | |
| 588 | 588 | try { |
| 589 | 589 | |
| 590 | 590 | $sth = $this->db->prepare($query); |
| 591 | 591 | $sth->execute(array(':ident' => $ident)); |
| 592 | - } catch(PDOException $e) { |
|
| 592 | + } catch (PDOException $e) { |
|
| 593 | 593 | echo $e->getMessage(); |
| 594 | 594 | die; |
| 595 | 595 | } |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | * @return Array the spotter information |
| 605 | 605 | * |
| 606 | 606 | */ |
| 607 | - public function getAllLiveSpotterDataById($id,$liveinterval = false) |
|
| 607 | + public function getAllLiveSpotterDataById($id, $liveinterval = false) |
|
| 608 | 608 | { |
| 609 | 609 | global $globalDBdriver, $globalLiveInterval; |
| 610 | 610 | date_default_timezone_set('UTC'); |
@@ -623,7 +623,7 @@ discard block |
||
| 623 | 623 | try { |
| 624 | 624 | $sth = $this->db->prepare($query); |
| 625 | 625 | $sth->execute(array(':id' => $id)); |
| 626 | - } catch(PDOException $e) { |
|
| 626 | + } catch (PDOException $e) { |
|
| 627 | 627 | echo $e->getMessage(); |
| 628 | 628 | die; |
| 629 | 629 | } |
@@ -641,12 +641,12 @@ discard block |
||
| 641 | 641 | { |
| 642 | 642 | date_default_timezone_set('UTC'); |
| 643 | 643 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 644 | - $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 644 | + $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 645 | 645 | try { |
| 646 | 646 | |
| 647 | 647 | $sth = $this->db->prepare($query); |
| 648 | 648 | $sth->execute(array(':ident' => $ident)); |
| 649 | - } catch(PDOException $e) { |
|
| 649 | + } catch (PDOException $e) { |
|
| 650 | 650 | echo $e->getMessage(); |
| 651 | 651 | die; |
| 652 | 652 | } |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | |
| 677 | 677 | $sth = $this->db->prepare($query); |
| 678 | 678 | $sth->execute(); |
| 679 | - } catch(PDOException $e) { |
|
| 679 | + } catch (PDOException $e) { |
|
| 680 | 680 | return "error"; |
| 681 | 681 | } |
| 682 | 682 | |
@@ -699,14 +699,14 @@ discard block |
||
| 699 | 699 | |
| 700 | 700 | $sth = $this->db->prepare($query); |
| 701 | 701 | $sth->execute(); |
| 702 | - } catch(PDOException $e) { |
|
| 702 | + } catch (PDOException $e) { |
|
| 703 | 703 | return "error"; |
| 704 | 704 | } |
| 705 | 705 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 706 | 706 | $i = 0; |
| 707 | - $j =0; |
|
| 707 | + $j = 0; |
|
| 708 | 708 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 709 | - foreach($all as $row) |
|
| 709 | + foreach ($all as $row) |
|
| 710 | 710 | { |
| 711 | 711 | $i++; |
| 712 | 712 | $j++; |
@@ -714,9 +714,9 @@ discard block |
||
| 714 | 714 | if ($globalDebug) echo "."; |
| 715 | 715 | try { |
| 716 | 716 | |
| 717 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 717 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 718 | 718 | $sth->execute(); |
| 719 | - } catch(PDOException $e) { |
|
| 719 | + } catch (PDOException $e) { |
|
| 720 | 720 | return "error"; |
| 721 | 721 | } |
| 722 | 722 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
@@ -727,9 +727,9 @@ discard block |
||
| 727 | 727 | if ($i > 0) { |
| 728 | 728 | try { |
| 729 | 729 | |
| 730 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 730 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 731 | 731 | $sth->execute(); |
| 732 | - } catch(PDOException $e) { |
|
| 732 | + } catch (PDOException $e) { |
|
| 733 | 733 | return "error"; |
| 734 | 734 | } |
| 735 | 735 | } |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | |
| 743 | 743 | $sth = $this->db->prepare($query); |
| 744 | 744 | $sth->execute(); |
| 745 | - } catch(PDOException $e) { |
|
| 745 | + } catch (PDOException $e) { |
|
| 746 | 746 | return "error"; |
| 747 | 747 | } |
| 748 | 748 | /* $query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN ("; |
@@ -790,13 +790,13 @@ discard block |
||
| 790 | 790 | public function deleteLiveSpotterDataByIdent($ident) |
| 791 | 791 | { |
| 792 | 792 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 793 | - $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 793 | + $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 794 | 794 | |
| 795 | 795 | try { |
| 796 | 796 | |
| 797 | 797 | $sth = $this->db->prepare($query); |
| 798 | 798 | $sth->execute(array(':ident' => $ident)); |
| 799 | - } catch(PDOException $e) { |
|
| 799 | + } catch (PDOException $e) { |
|
| 800 | 800 | return "error"; |
| 801 | 801 | } |
| 802 | 802 | |
@@ -812,13 +812,13 @@ discard block |
||
| 812 | 812 | public function deleteLiveSpotterDataById($id) |
| 813 | 813 | { |
| 814 | 814 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 815 | - $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 815 | + $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 816 | 816 | |
| 817 | 817 | try { |
| 818 | 818 | |
| 819 | 819 | $sth = $this->db->prepare($query); |
| 820 | 820 | $sth->execute(array(':id' => $id)); |
| 821 | - } catch(PDOException $e) { |
|
| 821 | + } catch (PDOException $e) { |
|
| 822 | 822 | return "error"; |
| 823 | 823 | } |
| 824 | 824 | |
@@ -836,13 +836,13 @@ discard block |
||
| 836 | 836 | { |
| 837 | 837 | global $globalDBdriver, $globalTimezone; |
| 838 | 838 | if ($globalDBdriver == 'mysql') { |
| 839 | - $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 839 | + $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 840 | 840 | WHERE spotter_live.ident = :ident |
| 841 | 841 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 842 | 842 | AND spotter_live.date < UTC_TIMESTAMP()'; |
| 843 | 843 | $query_data = array(':ident' => $ident); |
| 844 | 844 | } else { |
| 845 | - $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 845 | + $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 846 | 846 | WHERE spotter_live.ident = :ident |
| 847 | 847 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 848 | 848 | AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -851,8 +851,8 @@ discard block |
||
| 851 | 851 | |
| 852 | 852 | $sth = $this->db->prepare($query); |
| 853 | 853 | $sth->execute($query_data); |
| 854 | - $ident_result=''; |
|
| 855 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 854 | + $ident_result = ''; |
|
| 855 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 856 | 856 | { |
| 857 | 857 | $ident_result = $row['ident']; |
| 858 | 858 | } |
@@ -869,13 +869,13 @@ discard block |
||
| 869 | 869 | { |
| 870 | 870 | global $globalDBdriver, $globalTimezone; |
| 871 | 871 | if ($globalDBdriver == 'mysql') { |
| 872 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 872 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 873 | 873 | WHERE spotter_live.ident = :ident |
| 874 | 874 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 875 | 875 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 876 | 876 | $query_data = array(':ident' => $ident); |
| 877 | 877 | } else { |
| 878 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 878 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 879 | 879 | WHERE spotter_live.ident = :ident |
| 880 | 880 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 881 | 881 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -884,8 +884,8 @@ discard block |
||
| 884 | 884 | |
| 885 | 885 | $sth = $this->db->prepare($query); |
| 886 | 886 | $sth->execute($query_data); |
| 887 | - $ident_result=''; |
|
| 888 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 887 | + $ident_result = ''; |
|
| 888 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 889 | 889 | { |
| 890 | 890 | $ident_result = $row['flightaware_id']; |
| 891 | 891 | } |
@@ -902,13 +902,13 @@ discard block |
||
| 902 | 902 | { |
| 903 | 903 | global $globalDBdriver, $globalTimezone; |
| 904 | 904 | if ($globalDBdriver == 'mysql') { |
| 905 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 905 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 906 | 906 | WHERE spotter_live.flightaware_id = :id |
| 907 | 907 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 908 | 908 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 909 | 909 | $query_data = array(':id' => $id); |
| 910 | 910 | } else { |
| 911 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 911 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 912 | 912 | WHERE spotter_live.flightaware_id = :id |
| 913 | 913 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 914 | 914 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -917,8 +917,8 @@ discard block |
||
| 917 | 917 | |
| 918 | 918 | $sth = $this->db->prepare($query); |
| 919 | 919 | $sth->execute($query_data); |
| 920 | - $ident_result=''; |
|
| 921 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 920 | + $ident_result = ''; |
|
| 921 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 922 | 922 | { |
| 923 | 923 | $ident_result = $row['flightaware_id']; |
| 924 | 924 | } |
@@ -935,13 +935,13 @@ discard block |
||
| 935 | 935 | { |
| 936 | 936 | global $globalDBdriver, $globalTimezone; |
| 937 | 937 | if ($globalDBdriver == 'mysql') { |
| 938 | - $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 938 | + $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 939 | 939 | WHERE spotter_live.ModeS = :modes |
| 940 | 940 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 941 | 941 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 942 | 942 | $query_data = array(':modes' => $modes); |
| 943 | 943 | } else { |
| 944 | - $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 944 | + $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 945 | 945 | WHERE spotter_live.ModeS = :modes |
| 946 | 946 | AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'"; |
| 947 | 947 | // // AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
@@ -950,8 +950,8 @@ discard block |
||
| 950 | 950 | |
| 951 | 951 | $sth = $this->db->prepare($query); |
| 952 | 952 | $sth->execute($query_data); |
| 953 | - $ident_result=''; |
|
| 954 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 953 | + $ident_result = ''; |
|
| 954 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 955 | 955 | { |
| 956 | 956 | //$ident_result = $row['spotter_live_id']; |
| 957 | 957 | $ident_result = $row['flightaware_id']; |
@@ -970,7 +970,7 @@ discard block |
||
| 970 | 970 | * @return String success or false |
| 971 | 971 | * |
| 972 | 972 | */ |
| 973 | - public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
|
| 973 | + public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '') |
|
| 974 | 974 | { |
| 975 | 975 | global $globalURL, $globalArchive, $globalDebug; |
| 976 | 976 | $Common = new Common(); |
@@ -1070,27 +1070,27 @@ discard block |
||
| 1070 | 1070 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 1071 | 1071 | |
| 1072 | 1072 | |
| 1073 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 1074 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1075 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 1076 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1077 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1078 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1079 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1080 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 1081 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1082 | - $altitude_real = filter_var($altitude_real,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1083 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1085 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 1086 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 1087 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 1088 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 1089 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 1090 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 1091 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 1092 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 1093 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 1073 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 1074 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1075 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 1076 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1077 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1078 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1079 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1080 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 1081 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1082 | + $altitude_real = filter_var($altitude_real, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1083 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1085 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 1086 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 1087 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 1088 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 1089 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 1090 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 1091 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 1092 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 1093 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 1094 | 1094 | |
| 1095 | 1095 | $airline_name = ''; |
| 1096 | 1096 | $airline_icao = ''; |
@@ -1112,10 +1112,10 @@ discard block |
||
| 1112 | 1112 | $arrival_airport_country = ''; |
| 1113 | 1113 | |
| 1114 | 1114 | |
| 1115 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1116 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1117 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1118 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1115 | + if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL; |
|
| 1116 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL; |
|
| 1117 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 1118 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 1119 | 1119 | |
| 1120 | 1120 | $query = ''; |
| 1121 | 1121 | if ($globalArchive) { |
@@ -1126,19 +1126,19 @@ discard block |
||
| 1126 | 1126 | $query .= 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country, real_altitude) |
| 1127 | 1127 | VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country, :real_altitude)'; |
| 1128 | 1128 | |
| 1129 | - $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_shadow' => $aircraft_shadow,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk,':route_stop' => $route_stop,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country,':real_altitude' => $altitude_real); |
|
| 1129 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country, ':real_altitude' => $altitude_real); |
|
| 1130 | 1130 | try { |
| 1131 | 1131 | |
| 1132 | 1132 | $sth = $this->db->prepare($query); |
| 1133 | 1133 | $sth->execute($query_values); |
| 1134 | 1134 | $sth->closeCursor(); |
| 1135 | - } catch(PDOException $e) { |
|
| 1135 | + } catch (PDOException $e) { |
|
| 1136 | 1136 | return "error : ".$e->getMessage(); |
| 1137 | 1137 | } |
| 1138 | 1138 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1139 | 1139 | if ($globalDebug) echo '(Add to SBS archive : '; |
| 1140 | 1140 | $SpotterArchive = new SpotterArchive($this->db); |
| 1141 | - $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1141 | + $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time, $arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country); |
|
| 1142 | 1142 | if ($globalDebug) echo $result.')'; |
| 1143 | 1143 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1144 | 1144 | echo '(Not adding to archive)'; |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | |
| 1152 | 1152 | public function getOrderBy() |
| 1153 | 1153 | { |
| 1154 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1154 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1155 | 1155 | return $orderby; |
| 1156 | 1156 | } |
| 1157 | 1157 | |
