Ysurac /
FlightAirMap
@@ -131,5 +131,5 @@ |
||
| 131 | 131 | } else { |
| 132 | 132 | var clockViewModel = new Cesium.ClockViewModel(viewer.clock); |
| 133 | 133 | var animationViewModel = new Cesium.AnimationViewModel(clockViewModel); |
| 134 | - $(".archivebox").html('<h4><?php echo str_replace("'","\'",_("Archive")); ?></h4>' + '<br/><form id="noarchive" method="post"><input type="hidden" name="noarchive" /></form><a href="#" onClick="animationViewModel.playReverseViewModel.command();"><i class="fa fa-play fa-flip-horizontal" aria-hidden="true"></i></a> <a href="#" onClick="'+"document.getElementById('noarchive').submit();"+'"><i class="fa fa-eject" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.pauseViewModel.command();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.playForwardViewModel.command();"><i class="fa fa-play" aria-hidden="true"></i></a>'); |
|
| 134 | + $(".archivebox").html('<h4><?php echo str_replace("'", "\'", _("Archive")); ?></h4>' + '<br/><form id="noarchive" method="post"><input type="hidden" name="noarchive" /></form><a href="#" onClick="animationViewModel.playReverseViewModel.command();"><i class="fa fa-play fa-flip-horizontal" aria-hidden="true"></i></a> <a href="#" onClick="'+"document.getElementById('noarchive').submit();"+'"><i class="fa fa-eject" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.pauseViewModel.command();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.playForwardViewModel.command();"><i class="fa fa-play" aria-hidden="true"></i></a>'); |
|
| 135 | 135 | } |
@@ -24,20 +24,20 @@ discard block |
||
| 24 | 24 | fclose($fp); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - public static function gunzip($in_file,$out_file_name = '') { |
|
| 27 | + public static function gunzip($in_file, $out_file_name = '') { |
|
| 28 | 28 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 29 | 29 | $buffer_size = 4096; // read 4kb at a time |
| 30 | 30 | if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
| 31 | 31 | if ($in_file != '' && file_exists($in_file)) { |
| 32 | 32 | // PHP version of Ubuntu use gzopen64 instead of gzopen |
| 33 | - if (function_exists('gzopen')) $file = gzopen($in_file,'rb'); |
|
| 34 | - elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb'); |
|
| 33 | + if (function_exists('gzopen')) $file = gzopen($in_file, 'rb'); |
|
| 34 | + elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb'); |
|
| 35 | 35 | else { |
| 36 | 36 | echo 'gzopen not available'; |
| 37 | 37 | die; |
| 38 | 38 | } |
| 39 | 39 | $out_file = fopen($out_file_name, 'wb'); |
| 40 | - while(!gzeof($file)) { |
|
| 40 | + while (!gzeof($file)) { |
|
| 41 | 41 | fwrite($out_file, gzread($file, $buffer_size)); |
| 42 | 42 | } |
| 43 | 43 | fclose($out_file); |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | try { |
| 62 | 62 | self::$db_sqlite = new PDO('sqlite:'.$database); |
| 63 | 63 | self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 64 | - } catch(PDOException $e) { |
|
| 64 | + } catch (PDOException $e) { |
|
| 65 | 65 | return "error : ".$e->getMessage(); |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | //$Connection = new Connection(); |
| 77 | 77 | $sth = $Connection->db->prepare($query); |
| 78 | 78 | $sth->execute(array(':source' => $database_file)); |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | return "error : ".$e->getMessage(); |
| 81 | 81 | } |
| 82 | 82 | |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | try { |
| 88 | 88 | $sth = update_db::$db_sqlite->prepare($query); |
| 89 | 89 | $sth->execute(); |
| 90 | - } catch(PDOException $e) { |
|
| 90 | + } catch (PDOException $e) { |
|
| 91 | 91 | return "error : ".$e->getMessage(); |
| 92 | 92 | } |
| 93 | 93 | //$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)'; |
@@ -98,11 +98,11 @@ discard block |
||
| 98 | 98 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 99 | 99 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 100 | 100 | //$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); |
| 101 | - $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); |
|
| 101 | + $query_dest_values = array(':CallSign' => $values['Callsign'], ':Operator_ICAO' => $values['operator_icao'], ':FromAirport_ICAO' => $values['FromAirportIcao'], ':ToAirport_ICAO' => $values['ToAirportIcao'], ':routestop' => $values['AllStop'], ':source' => $database_file); |
|
| 102 | 102 | $sth_dest->execute($query_dest_values); |
| 103 | 103 | } |
| 104 | 104 | if ($globalTransaction) $Connection->db->commit(); |
| 105 | - } catch(PDOException $e) { |
|
| 105 | + } catch (PDOException $e) { |
|
| 106 | 106 | if ($globalTransaction) $Connection->db->rollBack(); |
| 107 | 107 | return "error : ".$e->getMessage(); |
| 108 | 108 | } |
@@ -118,26 +118,26 @@ discard block |
||
| 118 | 118 | //$Connection = new Connection(); |
| 119 | 119 | $sth = $Connection->db->prepare($query); |
| 120 | 120 | $sth->execute(array(':source' => 'oneworld')); |
| 121 | - } catch(PDOException $e) { |
|
| 121 | + } catch (PDOException $e) { |
|
| 122 | 122 | return "error : ".$e->getMessage(); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | if ($globalDebug) echo " - Add routes to DB -"; |
| 126 | 126 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 127 | 127 | $Spotter = new Spotter(); |
| 128 | - if ($fh = fopen($database_file,"r")) { |
|
| 128 | + if ($fh = fopen($database_file, "r")) { |
|
| 129 | 129 | $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)'; |
| 130 | 130 | $Connection = new Connection(); |
| 131 | 131 | $sth_dest = $Connection->db->prepare($query_dest); |
| 132 | 132 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 133 | 133 | while (!feof($fh)) { |
| 134 | - $line = fgetcsv($fh,9999,','); |
|
| 134 | + $line = fgetcsv($fh, 9999, ','); |
|
| 135 | 135 | if ($line[0] != '') { |
| 136 | 136 | if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) { |
| 137 | 137 | try { |
| 138 | - $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'); |
|
| 138 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[7]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[5], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[6], ':routestop' => '', ':source' => 'oneworld'); |
|
| 139 | 139 | $sth_dest->execute($query_dest_values); |
| 140 | - } catch(PDOException $e) { |
|
| 140 | + } catch (PDOException $e) { |
|
| 141 | 141 | if ($globalTransaction) $Connection->db->rollBack(); |
| 142 | 142 | return "error : ".$e->getMessage(); |
| 143 | 143 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | //$Connection = new Connection(); |
| 160 | 160 | $sth = $Connection->db->prepare($query); |
| 161 | 161 | $sth->execute(array(':source' => 'skyteam')); |
| 162 | - } catch(PDOException $e) { |
|
| 162 | + } catch (PDOException $e) { |
|
| 163 | 163 | return "error : ".$e->getMessage(); |
| 164 | 164 | } |
| 165 | 165 | |
@@ -167,24 +167,24 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 169 | 169 | $Spotter = new Spotter(); |
| 170 | - if ($fh = fopen($database_file,"r")) { |
|
| 170 | + if ($fh = fopen($database_file, "r")) { |
|
| 171 | 171 | $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)'; |
| 172 | 172 | $Connection = new Connection(); |
| 173 | 173 | $sth_dest = $Connection->db->prepare($query_dest); |
| 174 | 174 | try { |
| 175 | 175 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 176 | 176 | while (!feof($fh)) { |
| 177 | - $line = fgetcsv($fh,9999,','); |
|
| 177 | + $line = fgetcsv($fh, 9999, ','); |
|
| 178 | 178 | if ($line[0] != '') { |
| 179 | - $datebe = explode(' - ',$line[2]); |
|
| 179 | + $datebe = explode(' - ', $line[2]); |
|
| 180 | 180 | if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) { |
| 181 | - $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'); |
|
| 181 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam'); |
|
| 182 | 182 | $sth_dest->execute($query_dest_values); |
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | if ($globalTransaction) $Connection->db->commit(); |
| 187 | - } catch(PDOException $e) { |
|
| 187 | + } catch (PDOException $e) { |
|
| 188 | 188 | if ($globalTransaction) $Connection->db->rollBack(); |
| 189 | 189 | return "error : ".$e->getMessage(); |
| 190 | 190 | } |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | $Connection = new Connection(); |
| 200 | 200 | $sth = $Connection->db->prepare($query); |
| 201 | 201 | $sth->execute(array(':source' => $database_file)); |
| 202 | - } catch(PDOException $e) { |
|
| 202 | + } catch (PDOException $e) { |
|
| 203 | 203 | return "error : ".$e->getMessage(); |
| 204 | 204 | } |
| 205 | 205 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | $Connection = new Connection(); |
| 208 | 208 | $sth = $Connection->db->prepare($query); |
| 209 | 209 | $sth->execute(array(':source' => $database_file)); |
| 210 | - } catch(PDOException $e) { |
|
| 210 | + } catch (PDOException $e) { |
|
| 211 | 211 | return "error : ".$e->getMessage(); |
| 212 | 212 | } |
| 213 | 213 | |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | try { |
| 217 | 217 | $sth = update_db::$db_sqlite->prepare($query); |
| 218 | 218 | $sth->execute(); |
| 219 | - } catch(PDOException $e) { |
|
| 219 | + } catch (PDOException $e) { |
|
| 220 | 220 | return "error : ".$e->getMessage(); |
| 221 | 221 | } |
| 222 | 222 | //$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)'; |
@@ -233,15 +233,15 @@ discard block |
||
| 233 | 233 | //$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']); |
| 234 | 234 | if ($values['UserString4'] == 'M') $type = 'military'; |
| 235 | 235 | else $type = null; |
| 236 | - $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
|
| 236 | + $query_dest_values = array(':LastModified' => $values['LastModified'], ':ModeS' => $values['ModeS'], ':ModeSCountry' => $values['ModeSCountry'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':type' => $type); |
|
| 237 | 237 | $sth_dest->execute($query_dest_values); |
| 238 | 238 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
| 239 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 239 | + $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']); |
|
| 240 | 240 | $sth_dest_owner->execute($query_dest_owner_values); |
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | if ($globalTransaction) $Connection->db->commit(); |
| 244 | - } catch(PDOException $e) { |
|
| 244 | + } catch (PDOException $e) { |
|
| 245 | 245 | return "error : ".$e->getMessage(); |
| 246 | 246 | } |
| 247 | 247 | |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | $Connection = new Connection(); |
| 252 | 252 | $sth = $Connection->db->prepare($query); |
| 253 | 253 | $sth->execute(array(':source' => $database_file)); |
| 254 | - } catch(PDOException $e) { |
|
| 254 | + } catch (PDOException $e) { |
|
| 255 | 255 | return "error : ".$e->getMessage(); |
| 256 | 256 | } |
| 257 | 257 | return ''; |
@@ -266,11 +266,11 @@ discard block |
||
| 266 | 266 | $Connection = new Connection(); |
| 267 | 267 | $sth = $Connection->db->prepare($query); |
| 268 | 268 | $sth->execute(array(':source' => $database_file)); |
| 269 | - } catch(PDOException $e) { |
|
| 269 | + } catch (PDOException $e) { |
|
| 270 | 270 | return "error : ".$e->getMessage(); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | - if ($fh = fopen($database_file,"r")) { |
|
| 273 | + if ($fh = fopen($database_file, "r")) { |
|
| 274 | 274 | //$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)'; |
| 275 | 275 | $query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 276 | 276 | |
@@ -280,13 +280,13 @@ discard block |
||
| 280 | 280 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 281 | 281 | while (!feof($fh)) { |
| 282 | 282 | $values = array(); |
| 283 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
| 283 | + $line = $Common->hex2str(fgets($fh, 9999)); |
|
| 284 | 284 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 285 | - $values['ModeS'] = substr($line,0,6); |
|
| 286 | - $values['Registration'] = trim(substr($line,69,6)); |
|
| 287 | - $aircraft_name = trim(substr($line,48,6)); |
|
| 285 | + $values['ModeS'] = substr($line, 0, 6); |
|
| 286 | + $values['Registration'] = trim(substr($line, 69, 6)); |
|
| 287 | + $aircraft_name = trim(substr($line, 48, 6)); |
|
| 288 | 288 | // Check if we can find ICAO, else set it to GLID |
| 289 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 289 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 290 | 290 | $search_more = ''; |
| 291 | 291 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 292 | 292 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -298,20 +298,20 @@ discard block |
||
| 298 | 298 | if (isset($result['icao']) && $result['icao'] != '') { |
| 299 | 299 | $values['ICAOTypeCode'] = $result['icao']; |
| 300 | 300 | } |
| 301 | - } catch(PDOException $e) { |
|
| 301 | + } catch (PDOException $e) { |
|
| 302 | 302 | return "error : ".$e->getMessage(); |
| 303 | 303 | } |
| 304 | 304 | if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 305 | 305 | // Add data to db |
| 306 | 306 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
| 307 | 307 | //$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']); |
| 308 | - $query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
| 308 | + $query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
| 309 | 309 | //print_r($query_dest_values); |
| 310 | 310 | $sth_dest->execute($query_dest_values); |
| 311 | 311 | } |
| 312 | 312 | } |
| 313 | 313 | if ($globalTransaction) $Connection->db->commit(); |
| 314 | - } catch(PDOException $e) { |
|
| 314 | + } catch (PDOException $e) { |
|
| 315 | 315 | return "error : ".$e->getMessage(); |
| 316 | 316 | } |
| 317 | 317 | } |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | $Connection = new Connection(); |
| 322 | 322 | $sth = $Connection->db->prepare($query); |
| 323 | 323 | $sth->execute(array(':source' => $database_file)); |
| 324 | - } catch(PDOException $e) { |
|
| 324 | + } catch (PDOException $e) { |
|
| 325 | 325 | return "error : ".$e->getMessage(); |
| 326 | 326 | } |
| 327 | 327 | return ''; |
@@ -335,11 +335,11 @@ discard block |
||
| 335 | 335 | $Connection = new Connection(); |
| 336 | 336 | $sth = $Connection->db->prepare($query); |
| 337 | 337 | $sth->execute(array(':source' => $database_file)); |
| 338 | - } catch(PDOException $e) { |
|
| 338 | + } catch (PDOException $e) { |
|
| 339 | 339 | return "error : ".$e->getMessage(); |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | - if ($fh = fopen($database_file,"r")) { |
|
| 342 | + if ($fh = fopen($database_file, "r")) { |
|
| 343 | 343 | //$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)'; |
| 344 | 344 | $query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 345 | 345 | |
@@ -347,9 +347,9 @@ discard block |
||
| 347 | 347 | $sth_dest = $Connection->db->prepare($query_dest); |
| 348 | 348 | try { |
| 349 | 349 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 350 | - $tmp = fgetcsv($fh,9999,',',"'"); |
|
| 350 | + $tmp = fgetcsv($fh, 9999, ',', "'"); |
|
| 351 | 351 | while (!feof($fh)) { |
| 352 | - $line = fgetcsv($fh,9999,',',"'"); |
|
| 352 | + $line = fgetcsv($fh, 9999, ',', "'"); |
|
| 353 | 353 | |
| 354 | 354 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 355 | 355 | //print_r($line); |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $values['Registration'] = $line[3]; |
| 358 | 358 | $aircraft_name = $line[2]; |
| 359 | 359 | // Check if we can find ICAO, else set it to GLID |
| 360 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 360 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 361 | 361 | $search_more = ''; |
| 362 | 362 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 363 | 363 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -366,20 +366,20 @@ discard block |
||
| 366 | 366 | $sth_search->execute(); |
| 367 | 367 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
| 368 | 368 | if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
| 369 | - } catch(PDOException $e) { |
|
| 369 | + } catch (PDOException $e) { |
|
| 370 | 370 | return "error : ".$e->getMessage(); |
| 371 | 371 | } |
| 372 | 372 | //if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 373 | 373 | // Add data to db |
| 374 | 374 | if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') { |
| 375 | 375 | //$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']); |
| 376 | - $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'); |
|
| 376 | + $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'); |
|
| 377 | 377 | //print_r($query_dest_values); |
| 378 | 378 | $sth_dest->execute($query_dest_values); |
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | 381 | if ($globalTransaction) $Connection->db->commit(); |
| 382 | - } catch(PDOException $e) { |
|
| 382 | + } catch (PDOException $e) { |
|
| 383 | 383 | return "error : ".$e->getMessage(); |
| 384 | 384 | } |
| 385 | 385 | } |
@@ -389,13 +389,13 @@ discard block |
||
| 389 | 389 | $Connection = new Connection(); |
| 390 | 390 | $sth = $Connection->db->prepare($query); |
| 391 | 391 | $sth->execute(array(':source' => $database_file)); |
| 392 | - } catch(PDOException $e) { |
|
| 392 | + } catch (PDOException $e) { |
|
| 393 | 393 | return "error : ".$e->getMessage(); |
| 394 | 394 | } |
| 395 | 395 | return ''; |
| 396 | 396 | } |
| 397 | 397 | |
| 398 | - public static function retrieve_owner($database_file,$country = 'F') { |
|
| 398 | + public static function retrieve_owner($database_file, $country = 'F') { |
|
| 399 | 399 | global $globalTransaction, $globalMasterSource; |
| 400 | 400 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
| 401 | 401 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;"; |
@@ -403,12 +403,12 @@ discard block |
||
| 403 | 403 | $Connection = new Connection(); |
| 404 | 404 | $sth = $Connection->db->prepare($query); |
| 405 | 405 | $sth->execute(array(':source' => $database_file)); |
| 406 | - } catch(PDOException $e) { |
|
| 406 | + } catch (PDOException $e) { |
|
| 407 | 407 | return "error : ".$e->getMessage(); |
| 408 | 408 | } |
| 409 | 409 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 410 | 410 | $Spotter = new Spotter(); |
| 411 | - if ($fh = fopen($database_file,"r")) { |
|
| 411 | + if ($fh = fopen($database_file, "r")) { |
|
| 412 | 412 | //$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)'; |
| 413 | 413 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 414 | 414 | $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
@@ -418,9 +418,9 @@ discard block |
||
| 418 | 418 | $sth_modes = $Connection->db->prepare($query_modes); |
| 419 | 419 | try { |
| 420 | 420 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 421 | - $tmp = fgetcsv($fh,9999,',','"'); |
|
| 421 | + $tmp = fgetcsv($fh, 9999, ',', '"'); |
|
| 422 | 422 | while (!feof($fh)) { |
| 423 | - $line = fgetcsv($fh,9999,',','"'); |
|
| 423 | + $line = fgetcsv($fh, 9999, ',', '"'); |
|
| 424 | 424 | $values = array(); |
| 425 | 425 | //print_r($line); |
| 426 | 426 | if ($country == 'F') { |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | $values['base'] = $line[4]; |
| 429 | 429 | $values['owner'] = $line[5]; |
| 430 | 430 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 431 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 431 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 432 | 432 | $values['cancel'] = $line[7]; |
| 433 | 433 | } elseif ($country == 'EI') { |
| 434 | 434 | // TODO : add modeS & reg to aircraft_modes |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | $values['base'] = $line[3]; |
| 437 | 437 | $values['owner'] = $line[2]; |
| 438 | 438 | if ($line[1] == '') $values['date_first_reg'] = null; |
| 439 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 439 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1])); |
|
| 440 | 440 | $values['cancel'] = ''; |
| 441 | 441 | $values['modes'] = $line[7]; |
| 442 | 442 | $values['icao'] = $line[8]; |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | $values['base'] = null; |
| 457 | 457 | $values['owner'] = $line[5]; |
| 458 | 458 | if ($line[18] == '') $values['date_first_reg'] = null; |
| 459 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 459 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18])); |
|
| 460 | 460 | $values['cancel'] = ''; |
| 461 | 461 | } elseif ($country == 'VH') { |
| 462 | 462 | // TODO : add modeS & reg to aircraft_modes |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | $values['base'] = null; |
| 465 | 465 | $values['owner'] = $line[12]; |
| 466 | 466 | if ($line[28] == '') $values['date_first_reg'] = null; |
| 467 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 467 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28])); |
|
| 468 | 468 | |
| 469 | 469 | $values['cancel'] = $line[39]; |
| 470 | 470 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -484,28 +484,28 @@ discard block |
||
| 484 | 484 | $values['base'] = null; |
| 485 | 485 | $values['owner'] = $line[8]; |
| 486 | 486 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 487 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 487 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 488 | 488 | $values['cancel'] = ''; |
| 489 | 489 | } elseif ($country == 'PP') { |
| 490 | 490 | $values['registration'] = $line[0]; |
| 491 | 491 | $values['base'] = null; |
| 492 | 492 | $values['owner'] = $line[4]; |
| 493 | 493 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 494 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 494 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 495 | 495 | $values['cancel'] = $line[7]; |
| 496 | 496 | } elseif ($country == 'E7') { |
| 497 | 497 | $values['registration'] = $line[0]; |
| 498 | 498 | $values['base'] = null; |
| 499 | 499 | $values['owner'] = $line[4]; |
| 500 | 500 | if ($line[5] == '') $values['date_first_reg'] = null; |
| 501 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 501 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 502 | 502 | $values['cancel'] = ''; |
| 503 | 503 | } elseif ($country == '8Q') { |
| 504 | 504 | $values['registration'] = $line[0]; |
| 505 | 505 | $values['base'] = null; |
| 506 | 506 | $values['owner'] = $line[3]; |
| 507 | 507 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 508 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 508 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 509 | 509 | $values['cancel'] = ''; |
| 510 | 510 | } elseif ($country == 'ZK') { |
| 511 | 511 | $values['registration'] = $line[0]; |
@@ -519,18 +519,18 @@ discard block |
||
| 519 | 519 | $values['registration'] = $line[0]; |
| 520 | 520 | $values['base'] = null; |
| 521 | 521 | $values['owner'] = $line[6]; |
| 522 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 523 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 522 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 523 | + $values['cancel'] = date("Y-m-d", strtotime($line[8])); |
|
| 524 | 524 | $values['modes'] = $line[4]; |
| 525 | 525 | $values['icao'] = $line[10]; |
| 526 | 526 | } elseif ($country == 'OY') { |
| 527 | 527 | $values['registration'] = $line[0]; |
| 528 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 528 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[4])); |
|
| 529 | 529 | $values['modes'] = $line[5]; |
| 530 | 530 | $values['icao'] = $line[6]; |
| 531 | 531 | } elseif ($country == 'PH') { |
| 532 | 532 | $values['registration'] = $line[0]; |
| 533 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 533 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[3])); |
|
| 534 | 534 | $values['modes'] = $line[4]; |
| 535 | 535 | $values['icao'] = $line[5]; |
| 536 | 536 | } elseif ($country == 'OM' || $country == 'TF') { |
@@ -541,17 +541,17 @@ discard block |
||
| 541 | 541 | $values['cancel'] = ''; |
| 542 | 542 | } |
| 543 | 543 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
| 544 | - $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
|
| 544 | + $query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file); |
|
| 545 | 545 | $sth_dest->execute($query_dest_values); |
| 546 | 546 | } |
| 547 | 547 | if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') { |
| 548 | 548 | $modescountry = $Spotter->countryFromAircraftRegistration($values['registration']); |
| 549 | - $query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file); |
|
| 549 | + $query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file); |
|
| 550 | 550 | $sth_modes->execute($query_modes_values); |
| 551 | 551 | } |
| 552 | 552 | } |
| 553 | 553 | if ($globalTransaction) $Connection->db->commit(); |
| 554 | - } catch(PDOException $e) { |
|
| 554 | + } catch (PDOException $e) { |
|
| 555 | 555 | return "error : ".$e->getMessage(); |
| 556 | 556 | } |
| 557 | 557 | } |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | $Connection = new Connection(); |
| 667 | 667 | $sth = $Connection->db->prepare($query); |
| 668 | 668 | $sth->execute(); |
| 669 | - } catch(PDOException $e) { |
|
| 669 | + } catch (PDOException $e) { |
|
| 670 | 670 | return "error : ".$e->getMessage(); |
| 671 | 671 | } |
| 672 | 672 | |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | $Connection = new Connection(); |
| 677 | 677 | $sth = $Connection->db->prepare($query); |
| 678 | 678 | $sth->execute(); |
| 679 | - } catch(PDOException $e) { |
|
| 679 | + } catch (PDOException $e) { |
|
| 680 | 680 | return "error : ".$e->getMessage(); |
| 681 | 681 | } |
| 682 | 682 | |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 688 | 688 | |
| 689 | 689 | $i = 0; |
| 690 | - while($row = sparql_fetch_array($result)) |
|
| 690 | + while ($row = sparql_fetch_array($result)) |
|
| 691 | 691 | { |
| 692 | 692 | if ($i >= 1) { |
| 693 | 693 | //print_r($row); |
@@ -707,31 +707,31 @@ discard block |
||
| 707 | 707 | $row['image'] = ''; |
| 708 | 708 | $row['image_thumb'] = ''; |
| 709 | 709 | } else { |
| 710 | - $image = str_replace(' ','_',$row['image']); |
|
| 710 | + $image = str_replace(' ', '_', $row['image']); |
|
| 711 | 711 | $digest = md5($image); |
| 712 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image; |
|
| 713 | - $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder; |
|
| 714 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image; |
|
| 715 | - $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder; |
|
| 712 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image; |
|
| 713 | + $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder; |
|
| 714 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image; |
|
| 715 | + $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder; |
|
| 716 | 716 | } |
| 717 | 717 | |
| 718 | - $country = explode('-',$row['country']); |
|
| 718 | + $country = explode('-', $row['country']); |
|
| 719 | 719 | $row['country'] = $country[0]; |
| 720 | 720 | |
| 721 | 721 | $row['type'] = trim($row['type']); |
| 722 | - 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'])) { |
|
| 722 | + 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'])) { |
|
| 723 | 723 | $row['type'] = 'Military'; |
| 724 | 724 | } 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') { |
| 725 | 725 | $row['type'] = 'small_airport'; |
| 726 | 726 | } |
| 727 | 727 | |
| 728 | - $row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city']))); |
|
| 729 | - $query_dest_values = array(':airport_id' => $i, ':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => $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']); |
|
| 728 | + $row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city']))); |
|
| 729 | + $query_dest_values = array(':airport_id' => $i, ':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => $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']); |
|
| 730 | 730 | //print_r($query_dest_values); |
| 731 | 731 | |
| 732 | 732 | try { |
| 733 | 733 | $sth_dest->execute($query_dest_values); |
| 734 | - } catch(PDOException $e) { |
|
| 734 | + } catch (PDOException $e) { |
|
| 735 | 735 | return "error : ".$e->getMessage(); |
| 736 | 736 | } |
| 737 | 737 | } |
@@ -745,7 +745,7 @@ discard block |
||
| 745 | 745 | $Connection = new Connection(); |
| 746 | 746 | $sth = $Connection->db->prepare($query); |
| 747 | 747 | $sth->execute(); |
| 748 | - } catch(PDOException $e) { |
|
| 748 | + } catch (PDOException $e) { |
|
| 749 | 749 | return "error : ".$e->getMessage(); |
| 750 | 750 | } |
| 751 | 751 | |
@@ -753,12 +753,12 @@ discard block |
||
| 753 | 753 | if ($globalDebug) echo "Insert Not available Airport...\n"; |
| 754 | 754 | $query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`) |
| 755 | 755 | VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)"; |
| 756 | - $query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => ''); |
|
| 756 | + $query_values = array(':airport_id' => $i, ':name' => 'Not available', ':iata' => 'NA', ':icao' => 'NA', ':latitude' => '0', ':longitude' => '0', ':altitude' => '0', ':type' => 'NA', ':city' => 'N/A', ':country' => 'N/A', ':home_link' => '', ':wikipedia_link' => '', ':image' => '', ':image_thumb' => ''); |
|
| 757 | 757 | try { |
| 758 | 758 | $Connection = new Connection(); |
| 759 | 759 | $sth = $Connection->db->prepare($query); |
| 760 | 760 | $sth->execute($query_values); |
| 761 | - } catch(PDOException $e) { |
|
| 761 | + } catch (PDOException $e) { |
|
| 762 | 762 | return "error : ".$e->getMessage(); |
| 763 | 763 | } |
| 764 | 764 | $i++; |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | echo "Download data from ourairports.com...\n"; |
| 777 | 777 | $delimiter = ','; |
| 778 | 778 | $out_file = $tmp_dir.'airports.csv'; |
| 779 | - update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
|
| 779 | + update_db::download('http://ourairports.com/data/airports.csv', $out_file); |
|
| 780 | 780 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 781 | 781 | echo "Add data from ourairports.com...\n"; |
| 782 | 782 | |
@@ -787,32 +787,32 @@ discard block |
||
| 787 | 787 | //$Connection->db->beginTransaction(); |
| 788 | 788 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 789 | 789 | { |
| 790 | - if(!$header) $header = $row; |
|
| 790 | + if (!$header) $header = $row; |
|
| 791 | 791 | else { |
| 792 | 792 | $data = array(); |
| 793 | 793 | $data = array_combine($header, $row); |
| 794 | 794 | try { |
| 795 | 795 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE `icao` = :icao'); |
| 796 | 796 | $sth->execute(array(':icao' => $data['gps_code'])); |
| 797 | - } catch(PDOException $e) { |
|
| 797 | + } catch (PDOException $e) { |
|
| 798 | 798 | return "error : ".$e->getMessage(); |
| 799 | 799 | } |
| 800 | 800 | if ($sth->fetchColumn() > 0) { |
| 801 | 801 | $query = 'UPDATE airport SET `type` = :type WHERE icao = :icao'; |
| 802 | 802 | try { |
| 803 | 803 | $sth = $Connection->db->prepare($query); |
| 804 | - $sth->execute(array(':icao' => $data['gps_code'],':type' => $data['type'])); |
|
| 805 | - } catch(PDOException $e) { |
|
| 804 | + $sth->execute(array(':icao' => $data['gps_code'], ':type' => $data['type'])); |
|
| 805 | + } catch (PDOException $e) { |
|
| 806 | 806 | return "error : ".$e->getMessage(); |
| 807 | 807 | } |
| 808 | 808 | } else { |
| 809 | 809 | $query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`) |
| 810 | 810 | VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)"; |
| 811 | - $query_values = array(':airport_id' => $i, ':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => $data['elevation_ft'],':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']); |
|
| 811 | + $query_values = array(':airport_id' => $i, ':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => $data['elevation_ft'], ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']); |
|
| 812 | 812 | try { |
| 813 | 813 | $sth = $Connection->db->prepare($query); |
| 814 | 814 | $sth->execute($query_values); |
| 815 | - } catch(PDOException $e) { |
|
| 815 | + } catch (PDOException $e) { |
|
| 816 | 816 | return "error : ".$e->getMessage(); |
| 817 | 817 | } |
| 818 | 818 | $i++; |
@@ -825,7 +825,7 @@ discard block |
||
| 825 | 825 | |
| 826 | 826 | echo "Download data from another free database...\n"; |
| 827 | 827 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
| 828 | - update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
|
| 828 | + update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file); |
|
| 829 | 829 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 830 | 830 | update_db::unzip($out_file); |
| 831 | 831 | $header = NULL; |
@@ -837,15 +837,15 @@ discard block |
||
| 837 | 837 | //$Connection->db->beginTransaction(); |
| 838 | 838 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 839 | 839 | { |
| 840 | - if(!$header) $header = $row; |
|
| 840 | + if (!$header) $header = $row; |
|
| 841 | 841 | else { |
| 842 | 842 | $data = $row; |
| 843 | 843 | |
| 844 | 844 | $query = 'UPDATE airport SET `city` = :city, `country` = :country WHERE icao = :icao'; |
| 845 | 845 | try { |
| 846 | 846 | $sth = $Connection->db->prepare($query); |
| 847 | - $sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4])))); |
|
| 848 | - } catch(PDOException $e) { |
|
| 847 | + $sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4])))); |
|
| 848 | + } catch (PDOException $e) { |
|
| 849 | 849 | return "error : ".$e->getMessage(); |
| 850 | 850 | } |
| 851 | 851 | } |
@@ -859,15 +859,15 @@ discard block |
||
| 859 | 859 | try { |
| 860 | 860 | $sth = $Connection->db->prepare("SELECT icao FROM airport WHERE `name` LIKE '%Air Base%'"); |
| 861 | 861 | $sth->execute(); |
| 862 | - } catch(PDOException $e) { |
|
| 862 | + } catch (PDOException $e) { |
|
| 863 | 863 | return "error : ".$e->getMessage(); |
| 864 | 864 | } |
| 865 | 865 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 866 | 866 | $query2 = 'UPDATE airport SET `type` = :type WHERE icao = :icao'; |
| 867 | 867 | try { |
| 868 | 868 | $sth2 = $Connection->db->prepare($query2); |
| 869 | - $sth2->execute(array(':icao' => $row['icao'],':type' => 'military')); |
|
| 870 | - } catch(PDOException $e) { |
|
| 869 | + $sth2->execute(array(':icao' => $row['icao'], ':type' => 'military')); |
|
| 870 | + } catch (PDOException $e) { |
|
| 871 | 871 | return "error : ".$e->getMessage(); |
| 872 | 872 | } |
| 873 | 873 | } |
@@ -891,7 +891,7 @@ discard block |
||
| 891 | 891 | $Connection = new Connection(); |
| 892 | 892 | $sth = $Connection->db->prepare($query); |
| 893 | 893 | $sth->execute(array(':source' => 'translation.csv')); |
| 894 | - } catch(PDOException $e) { |
|
| 894 | + } catch (PDOException $e) { |
|
| 895 | 895 | return "error : ".$e->getMessage(); |
| 896 | 896 | } |
| 897 | 897 | |
@@ -908,7 +908,7 @@ discard block |
||
| 908 | 908 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 909 | 909 | { |
| 910 | 910 | $i++; |
| 911 | - if($i > 12) { |
|
| 911 | + if ($i > 12) { |
|
| 912 | 912 | $data = $row; |
| 913 | 913 | $operator = $data[2]; |
| 914 | 914 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
@@ -916,7 +916,7 @@ discard block |
||
| 916 | 916 | //echo substr($operator, 0, 2)."\n";; |
| 917 | 917 | if (count($airline_array) > 0) { |
| 918 | 918 | //print_r($airline_array); |
| 919 | - $operator = $airline_array[0]['icao'].substr($operator,2); |
|
| 919 | + $operator = $airline_array[0]['icao'].substr($operator, 2); |
|
| 920 | 920 | } |
| 921 | 921 | } |
| 922 | 922 | |
@@ -924,14 +924,14 @@ discard block |
||
| 924 | 924 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
| 925 | 925 | $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
| 926 | 926 | if (count($airline_array) > 0) { |
| 927 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 927 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2); |
|
| 928 | 928 | } |
| 929 | 929 | } |
| 930 | 930 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 931 | 931 | try { |
| 932 | 932 | $sth = $Connection->db->prepare($query); |
| 933 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 934 | - } catch(PDOException $e) { |
|
| 933 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 934 | + } catch (PDOException $e) { |
|
| 935 | 935 | return "error : ".$e->getMessage(); |
| 936 | 936 | } |
| 937 | 937 | } |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | $Connection = new Connection(); |
| 952 | 952 | $sth = $Connection->db->prepare($query); |
| 953 | 953 | $sth->execute(array(':source' => 'website_fam')); |
| 954 | - } catch(PDOException $e) { |
|
| 954 | + } catch (PDOException $e) { |
|
| 955 | 955 | return "error : ".$e->getMessage(); |
| 956 | 956 | } |
| 957 | 957 | |
@@ -971,8 +971,8 @@ discard block |
||
| 971 | 971 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 972 | 972 | try { |
| 973 | 973 | $sth = $Connection->db->prepare($query); |
| 974 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 975 | - } catch(PDOException $e) { |
|
| 974 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 975 | + } catch (PDOException $e) { |
|
| 976 | 976 | return "error : ".$e->getMessage(); |
| 977 | 977 | } |
| 978 | 978 | } |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | $Connection = new Connection(); |
| 996 | 996 | $sth = $Connection->db->prepare($query); |
| 997 | 997 | $sth->execute(array(':source' => 'website_faa')); |
| 998 | - } catch(PDOException $e) { |
|
| 998 | + } catch (PDOException $e) { |
|
| 999 | 999 | return "error : ".$e->getMessage(); |
| 1000 | 1000 | } |
| 1001 | 1001 | |
@@ -1004,7 +1004,7 @@ discard block |
||
| 1004 | 1004 | $Connection = new Connection(); |
| 1005 | 1005 | $sth = $Connection->db->prepare($query); |
| 1006 | 1006 | $sth->execute(array(':source' => 'website_faa')); |
| 1007 | - } catch(PDOException $e) { |
|
| 1007 | + } catch (PDOException $e) { |
|
| 1008 | 1008 | return "error : ".$e->getMessage(); |
| 1009 | 1009 | } |
| 1010 | 1010 | |
@@ -1021,8 +1021,8 @@ discard block |
||
| 1021 | 1021 | $query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1'; |
| 1022 | 1022 | try { |
| 1023 | 1023 | $sths = $Connection->db->prepare($query_search); |
| 1024 | - $sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa')); |
|
| 1025 | - } catch(PDOException $e) { |
|
| 1024 | + $sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa')); |
|
| 1025 | + } catch (PDOException $e) { |
|
| 1026 | 1026 | return "error s : ".$e->getMessage(); |
| 1027 | 1027 | } |
| 1028 | 1028 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
@@ -1035,8 +1035,8 @@ discard block |
||
| 1035 | 1035 | //} |
| 1036 | 1036 | try { |
| 1037 | 1037 | $sthi = $Connection->db->prepare($queryi); |
| 1038 | - $sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode'])); |
|
| 1039 | - } catch(PDOException $e) { |
|
| 1038 | + $sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode'])); |
|
| 1039 | + } catch (PDOException $e) { |
|
| 1040 | 1040 | return "error u : ".$e->getMessage(); |
| 1041 | 1041 | } |
| 1042 | 1042 | } else { |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | try { |
| 1045 | 1045 | $sthsm = $Connection->db->prepare($query_search_mfr); |
| 1046 | 1046 | $sthsm->execute(array(':mfr' => $data[2])); |
| 1047 | - } catch(PDOException $e) { |
|
| 1047 | + } catch (PDOException $e) { |
|
| 1048 | 1048 | return "error mfr : ".$e->getMessage(); |
| 1049 | 1049 | } |
| 1050 | 1050 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
@@ -1054,8 +1054,8 @@ discard block |
||
| 1054 | 1054 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
| 1055 | 1055 | try { |
| 1056 | 1056 | $sthf = $Connection->db->prepare($queryf); |
| 1057 | - $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')); |
|
| 1058 | - } catch(PDOException $e) { |
|
| 1057 | + $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')); |
|
| 1058 | + } catch (PDOException $e) { |
|
| 1059 | 1059 | return "error f : ".$e->getMessage(); |
| 1060 | 1060 | } |
| 1061 | 1061 | } |
@@ -1065,13 +1065,13 @@ discard block |
||
| 1065 | 1065 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 1066 | 1066 | try { |
| 1067 | 1067 | $sth = $Connection->db->prepare($query); |
| 1068 | - $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')); |
|
| 1069 | - } catch(PDOException $e) { |
|
| 1068 | + $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')); |
|
| 1069 | + } catch (PDOException $e) { |
|
| 1070 | 1070 | return "error i : ".$e->getMessage(); |
| 1071 | 1071 | } |
| 1072 | 1072 | } |
| 1073 | 1073 | } |
| 1074 | - if ($i % 90 == 0) { |
|
| 1074 | + if ($i%90 == 0) { |
|
| 1075 | 1075 | if ($globalTransaction) $Connection->db->commit(); |
| 1076 | 1076 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1077 | 1077 | } |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | $Connection = new Connection(); |
| 1091 | 1091 | $sth = $Connection->db->prepare($query); |
| 1092 | 1092 | $sth->execute(array(':source' => 'website_fam')); |
| 1093 | - } catch(PDOException $e) { |
|
| 1093 | + } catch (PDOException $e) { |
|
| 1094 | 1094 | return "error : ".$e->getMessage(); |
| 1095 | 1095 | } |
| 1096 | 1096 | |
@@ -1111,8 +1111,8 @@ discard block |
||
| 1111 | 1111 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
| 1112 | 1112 | try { |
| 1113 | 1113 | $sth = $Connection->db->prepare($query); |
| 1114 | - $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')); |
|
| 1115 | - } catch(PDOException $e) { |
|
| 1114 | + $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')); |
|
| 1115 | + } catch (PDOException $e) { |
|
| 1116 | 1116 | return "error : ".$e->getMessage(); |
| 1117 | 1117 | } |
| 1118 | 1118 | } |
@@ -1131,7 +1131,7 @@ discard block |
||
| 1131 | 1131 | $Connection = new Connection(); |
| 1132 | 1132 | $sth = $Connection->db->prepare($query); |
| 1133 | 1133 | $sth->execute(array(':source' => 'website_fam')); |
| 1134 | - } catch(PDOException $e) { |
|
| 1134 | + } catch (PDOException $e) { |
|
| 1135 | 1135 | return "error : ".$e->getMessage(); |
| 1136 | 1136 | } |
| 1137 | 1137 | |
@@ -1147,8 +1147,8 @@ discard block |
||
| 1147 | 1147 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)'; |
| 1148 | 1148 | try { |
| 1149 | 1149 | $sth = $Connection->db->prepare($query); |
| 1150 | - $sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1151 | - } catch(PDOException $e) { |
|
| 1150 | + $sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1151 | + } catch (PDOException $e) { |
|
| 1152 | 1152 | print_r($data); |
| 1153 | 1153 | return "error : ".$e->getMessage(); |
| 1154 | 1154 | } |
@@ -1168,7 +1168,7 @@ discard block |
||
| 1168 | 1168 | $Connection = new Connection(); |
| 1169 | 1169 | $sth = $Connection->db->prepare($query); |
| 1170 | 1170 | $sth->execute(array(':source' => 'website_fam')); |
| 1171 | - } catch(PDOException $e) { |
|
| 1171 | + } catch (PDOException $e) { |
|
| 1172 | 1172 | return "error : ".$e->getMessage(); |
| 1173 | 1173 | } |
| 1174 | 1174 | |
@@ -1188,8 +1188,8 @@ discard block |
||
| 1188 | 1188 | $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)'; |
| 1189 | 1189 | try { |
| 1190 | 1190 | $sth = $Connection->db->prepare($query); |
| 1191 | - $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')); |
|
| 1192 | - } catch(PDOException $e) { |
|
| 1191 | + $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')); |
|
| 1192 | + } catch (PDOException $e) { |
|
| 1193 | 1193 | return "error : ".$e->getMessage(); |
| 1194 | 1194 | } |
| 1195 | 1195 | } |
@@ -1208,7 +1208,7 @@ discard block |
||
| 1208 | 1208 | $Connection = new Connection(); |
| 1209 | 1209 | $sth = $Connection->db->prepare($query); |
| 1210 | 1210 | $sth->execute(); |
| 1211 | - } catch(PDOException $e) { |
|
| 1211 | + } catch (PDOException $e) { |
|
| 1212 | 1212 | return "error : ".$e->getMessage(); |
| 1213 | 1213 | } |
| 1214 | 1214 | |
@@ -1224,7 +1224,7 @@ discard block |
||
| 1224 | 1224 | try { |
| 1225 | 1225 | $sth = $Connection->db->prepare($query); |
| 1226 | 1226 | $sth->execute(array(':icao' => $icao)); |
| 1227 | - } catch(PDOException $e) { |
|
| 1227 | + } catch (PDOException $e) { |
|
| 1228 | 1228 | return "error : ".$e->getMessage(); |
| 1229 | 1229 | } |
| 1230 | 1230 | } |
@@ -1235,7 +1235,7 @@ discard block |
||
| 1235 | 1235 | return ''; |
| 1236 | 1236 | } |
| 1237 | 1237 | |
| 1238 | - public static function tle($filename,$tletype) { |
|
| 1238 | + public static function tle($filename, $tletype) { |
|
| 1239 | 1239 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1240 | 1240 | global $tmp_dir, $globalTransaction; |
| 1241 | 1241 | //$Spotter = new Spotter(); |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | $Connection = new Connection(); |
| 1246 | 1246 | $sth = $Connection->db->prepare($query); |
| 1247 | 1247 | $sth->execute(array(':source' => $filename)); |
| 1248 | - } catch(PDOException $e) { |
|
| 1248 | + } catch (PDOException $e) { |
|
| 1249 | 1249 | return "error : ".$e->getMessage(); |
| 1250 | 1250 | } |
| 1251 | 1251 | |
@@ -1270,8 +1270,8 @@ discard block |
||
| 1270 | 1270 | $query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)'; |
| 1271 | 1271 | try { |
| 1272 | 1272 | $sth = $Connection->db->prepare($query); |
| 1273 | - $sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename)); |
|
| 1274 | - } catch(PDOException $e) { |
|
| 1273 | + $sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename)); |
|
| 1274 | + } catch (PDOException $e) { |
|
| 1275 | 1275 | return "error : ".$e->getMessage(); |
| 1276 | 1276 | } |
| 1277 | 1277 | |
@@ -1291,28 +1291,28 @@ discard block |
||
| 1291 | 1291 | */ |
| 1292 | 1292 | private static function table2array($data) { |
| 1293 | 1293 | $html = str_get_html($data); |
| 1294 | - $tabledata=array(); |
|
| 1295 | - foreach($html->find('tr') as $element) |
|
| 1294 | + $tabledata = array(); |
|
| 1295 | + foreach ($html->find('tr') as $element) |
|
| 1296 | 1296 | { |
| 1297 | 1297 | $td = array(); |
| 1298 | - foreach( $element->find('th') as $row) |
|
| 1298 | + foreach ($element->find('th') as $row) |
|
| 1299 | 1299 | { |
| 1300 | 1300 | $td [] = trim($row->plaintext); |
| 1301 | 1301 | } |
| 1302 | - $td=array_filter($td); |
|
| 1302 | + $td = array_filter($td); |
|
| 1303 | 1303 | $tabledata[] = $td; |
| 1304 | 1304 | |
| 1305 | 1305 | $td = array(); |
| 1306 | 1306 | $tdi = array(); |
| 1307 | - foreach( $element->find('td') as $row) |
|
| 1307 | + foreach ($element->find('td') as $row) |
|
| 1308 | 1308 | { |
| 1309 | 1309 | $td [] = trim($row->plaintext); |
| 1310 | 1310 | $tdi [] = trim($row->innertext); |
| 1311 | 1311 | } |
| 1312 | - $td=array_filter($td); |
|
| 1313 | - $tdi=array_filter($tdi); |
|
| 1312 | + $td = array_filter($td); |
|
| 1313 | + $tdi = array_filter($tdi); |
|
| 1314 | 1314 | // $tabledata[]=array_merge($td,$tdi); |
| 1315 | - $tabledata[]=$td; |
|
| 1315 | + $tabledata[] = $td; |
|
| 1316 | 1316 | } |
| 1317 | 1317 | return(array_filter($tabledata)); |
| 1318 | 1318 | } |
@@ -1385,13 +1385,13 @@ discard block |
||
| 1385 | 1385 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1386 | 1386 | { |
| 1387 | 1387 | $i++; |
| 1388 | - if($i > 3 && count($row) > 2) { |
|
| 1388 | + if ($i > 3 && count($row) > 2) { |
|
| 1389 | 1389 | $data = array_values(array_filter($row)); |
| 1390 | 1390 | $cntdata = count($data); |
| 1391 | 1391 | if ($cntdata > 10) { |
| 1392 | 1392 | $value = $data[9]; |
| 1393 | 1393 | |
| 1394 | - for ($i =10;$i < $cntdata;$i++) { |
|
| 1394 | + for ($i = 10; $i < $cntdata; $i++) { |
|
| 1395 | 1395 | $value .= ' '.$data[$i]; |
| 1396 | 1396 | } |
| 1397 | 1397 | $data[9] = $value; |
@@ -1401,8 +1401,8 @@ discard block |
||
| 1401 | 1401 | $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)'; |
| 1402 | 1402 | try { |
| 1403 | 1403 | $sth = $Connection->db->prepare($query); |
| 1404 | - $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])); |
|
| 1405 | - } catch(PDOException $e) { |
|
| 1404 | + $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])); |
|
| 1405 | + } catch (PDOException $e) { |
|
| 1406 | 1406 | return "error : ".$e->getMessage(); |
| 1407 | 1407 | } |
| 1408 | 1408 | } |
@@ -1423,7 +1423,7 @@ discard block |
||
| 1423 | 1423 | $Connection = new Connection(); |
| 1424 | 1424 | $sth = $Connection->db->prepare($query); |
| 1425 | 1425 | $sth->execute(); |
| 1426 | - } catch(PDOException $e) { |
|
| 1426 | + } catch (PDOException $e) { |
|
| 1427 | 1427 | return "error : ".$e->getMessage(); |
| 1428 | 1428 | } |
| 1429 | 1429 | |
@@ -1435,12 +1435,12 @@ discard block |
||
| 1435 | 1435 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1436 | 1436 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1437 | 1437 | { |
| 1438 | - if(count($row) > 1) { |
|
| 1438 | + if (count($row) > 1) { |
|
| 1439 | 1439 | $query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')"; |
| 1440 | 1440 | try { |
| 1441 | 1441 | $sth = $Connection->db->prepare($query); |
| 1442 | - $sth->execute(array(':name' => $row[1],':icao' => $row[0])); |
|
| 1443 | - } catch(PDOException $e) { |
|
| 1442 | + $sth->execute(array(':name' => $row[1], ':icao' => $row[0])); |
|
| 1443 | + } catch (PDOException $e) { |
|
| 1444 | 1444 | return "error : ".$e->getMessage(); |
| 1445 | 1445 | } |
| 1446 | 1446 | } |
@@ -1460,21 +1460,21 @@ discard block |
||
| 1460 | 1460 | try { |
| 1461 | 1461 | $sth = $Connection->db->prepare($query); |
| 1462 | 1462 | $sth->execute(); |
| 1463 | - } catch(PDOException $e) { |
|
| 1463 | + } catch (PDOException $e) { |
|
| 1464 | 1464 | return "error : ".$e->getMessage(); |
| 1465 | 1465 | } |
| 1466 | 1466 | } |
| 1467 | 1467 | |
| 1468 | 1468 | |
| 1469 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1469 | + if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1470 | 1470 | else { |
| 1471 | - update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1471 | + update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1472 | 1472 | $query = "CREATE EXTENSION postgis"; |
| 1473 | - $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
|
| 1473 | + $Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']); |
|
| 1474 | 1474 | try { |
| 1475 | 1475 | $sth = $Connection->db->prepare($query); |
| 1476 | 1476 | $sth->execute(); |
| 1477 | - } catch(PDOException $e) { |
|
| 1477 | + } catch (PDOException $e) { |
|
| 1478 | 1478 | return "error : ".$e->getMessage(); |
| 1479 | 1479 | } |
| 1480 | 1480 | } |
@@ -1487,7 +1487,7 @@ discard block |
||
| 1487 | 1487 | include_once('class.create_db.php'); |
| 1488 | 1488 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1489 | 1489 | if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
| 1490 | - update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
|
| 1490 | + update_db::download('http://data.flightairmap.fr/data/notam.txt.gz', $tmp_dir.'notam.txt.gz'); |
|
| 1491 | 1491 | $error = ''; |
| 1492 | 1492 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1493 | 1493 | if ($globalDebug) echo "Gunzip..."; |
@@ -1519,14 +1519,14 @@ discard block |
||
| 1519 | 1519 | try { |
| 1520 | 1520 | $sth = $Connection->db->prepare($query); |
| 1521 | 1521 | $sth->execute(); |
| 1522 | - } catch(PDOException $e) { |
|
| 1522 | + } catch (PDOException $e) { |
|
| 1523 | 1523 | echo "error : ".$e->getMessage(); |
| 1524 | 1524 | } |
| 1525 | 1525 | } |
| 1526 | 1526 | if ($globalDBdriver == 'mysql') { |
| 1527 | - update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1527 | + update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1528 | 1528 | } else { |
| 1529 | - update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1529 | + update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1530 | 1530 | } |
| 1531 | 1531 | $error = create_db::import_file($tmp_dir.'countries.sql'); |
| 1532 | 1532 | return $error; |
@@ -1539,7 +1539,7 @@ discard block |
||
| 1539 | 1539 | // update_db::unzip($tmp_dir.'AptNav.zip'); |
| 1540 | 1540 | // update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz'); |
| 1541 | 1541 | // 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'); |
| 1542 | - 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'); |
|
| 1542 | + 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'); |
|
| 1543 | 1543 | update_db::gunzip($tmp_dir.'awy.dat.gz'); |
| 1544 | 1544 | $error = update_db::waypoints($tmp_dir.'awy.dat'); |
| 1545 | 1545 | return $error; |
@@ -1559,7 +1559,7 @@ discard block |
||
| 1559 | 1559 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 1560 | 1560 | if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
| 1561 | 1561 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 1562 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1562 | + if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1563 | 1563 | } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
| 1564 | 1564 | } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
| 1565 | 1565 | if ($error != '') { |
@@ -1572,7 +1572,7 @@ discard block |
||
| 1572 | 1572 | global $tmp_dir, $globalDebug; |
| 1573 | 1573 | $error = ''; |
| 1574 | 1574 | if ($globalDebug) echo "Routes : Download..."; |
| 1575 | - update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
|
| 1575 | + update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz'); |
|
| 1576 | 1576 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 1577 | 1577 | if ($globalDebug) echo "Gunzip..."; |
| 1578 | 1578 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
@@ -1588,7 +1588,7 @@ discard block |
||
| 1588 | 1588 | global $tmp_dir, $globalDebug; |
| 1589 | 1589 | $error = ''; |
| 1590 | 1590 | if ($globalDebug) echo "Schedules Oneworld : Download..."; |
| 1591 | - update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
|
| 1591 | + update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz'); |
|
| 1592 | 1592 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 1593 | 1593 | if ($globalDebug) echo "Gunzip..."; |
| 1594 | 1594 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
@@ -1604,7 +1604,7 @@ discard block |
||
| 1604 | 1604 | global $tmp_dir, $globalDebug; |
| 1605 | 1605 | $error = ''; |
| 1606 | 1606 | if ($globalDebug) echo "Schedules Skyteam : Download..."; |
| 1607 | - update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
|
| 1607 | + update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz'); |
|
| 1608 | 1608 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 1609 | 1609 | if ($globalDebug) echo "Gunzip..."; |
| 1610 | 1610 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
@@ -1632,7 +1632,7 @@ discard block |
||
| 1632 | 1632 | */ |
| 1633 | 1633 | if ($globalDebug) echo "Modes : Download..."; |
| 1634 | 1634 | // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
| 1635 | - update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
|
| 1635 | + update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz'); |
|
| 1636 | 1636 | |
| 1637 | 1637 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 1638 | 1638 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
@@ -1652,7 +1652,7 @@ discard block |
||
| 1652 | 1652 | public static function update_ModeS_faa() { |
| 1653 | 1653 | global $tmp_dir, $globalDebug; |
| 1654 | 1654 | if ($globalDebug) echo "Modes FAA: Download..."; |
| 1655 | - update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
|
| 1655 | + update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip'); |
|
| 1656 | 1656 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 1657 | 1657 | if ($globalDebug) echo "Unzip..."; |
| 1658 | 1658 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
@@ -1668,7 +1668,7 @@ discard block |
||
| 1668 | 1668 | public static function update_ModeS_flarm() { |
| 1669 | 1669 | global $tmp_dir, $globalDebug; |
| 1670 | 1670 | if ($globalDebug) echo "Modes Flarmnet: Download..."; |
| 1671 | - update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
|
| 1671 | + update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln'); |
|
| 1672 | 1672 | if (file_exists($tmp_dir.'data.fln')) { |
| 1673 | 1673 | if ($globalDebug) echo "Add to DB..."; |
| 1674 | 1674 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
@@ -1682,7 +1682,7 @@ discard block |
||
| 1682 | 1682 | public static function update_ModeS_ogn() { |
| 1683 | 1683 | global $tmp_dir, $globalDebug; |
| 1684 | 1684 | if ($globalDebug) echo "Modes OGN: Download..."; |
| 1685 | - update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
|
| 1685 | + update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv'); |
|
| 1686 | 1686 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 1687 | 1687 | if ($globalDebug) echo "Add to DB..."; |
| 1688 | 1688 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
@@ -1697,201 +1697,201 @@ discard block |
||
| 1697 | 1697 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 1698 | 1698 | |
| 1699 | 1699 | if ($globalDebug) echo "Owner France: Download..."; |
| 1700 | - update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
|
| 1700 | + update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv'); |
|
| 1701 | 1701 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 1702 | 1702 | if ($globalDebug) echo "Add to DB..."; |
| 1703 | - $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
|
| 1703 | + $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F'); |
|
| 1704 | 1704 | } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
| 1705 | 1705 | if ($error != '') { |
| 1706 | 1706 | return $error; |
| 1707 | 1707 | } elseif ($globalDebug) echo "Done\n"; |
| 1708 | 1708 | |
| 1709 | 1709 | if ($globalDebug) echo "Owner Ireland: Download..."; |
| 1710 | - update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
|
| 1710 | + update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv'); |
|
| 1711 | 1711 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 1712 | 1712 | if ($globalDebug) echo "Add to DB..."; |
| 1713 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
|
| 1713 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI'); |
|
| 1714 | 1714 | } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
| 1715 | 1715 | if ($error != '') { |
| 1716 | 1716 | return $error; |
| 1717 | 1717 | } elseif ($globalDebug) echo "Done\n"; |
| 1718 | 1718 | if ($globalDebug) echo "Owner Switzerland: Download..."; |
| 1719 | - update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
|
| 1719 | + update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv'); |
|
| 1720 | 1720 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 1721 | 1721 | if ($globalDebug) echo "Add to DB..."; |
| 1722 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
|
| 1722 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB'); |
|
| 1723 | 1723 | } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
| 1724 | 1724 | if ($error != '') { |
| 1725 | 1725 | return $error; |
| 1726 | 1726 | } elseif ($globalDebug) echo "Done\n"; |
| 1727 | 1727 | if ($globalDebug) echo "Owner Czech Republic: Download..."; |
| 1728 | - update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
|
| 1728 | + update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv'); |
|
| 1729 | 1729 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 1730 | 1730 | if ($globalDebug) echo "Add to DB..."; |
| 1731 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
|
| 1731 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK'); |
|
| 1732 | 1732 | } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
| 1733 | 1733 | if ($error != '') { |
| 1734 | 1734 | return $error; |
| 1735 | 1735 | } elseif ($globalDebug) echo "Done\n"; |
| 1736 | 1736 | if ($globalDebug) echo "Owner Australia: Download..."; |
| 1737 | - update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
|
| 1737 | + update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv'); |
|
| 1738 | 1738 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 1739 | 1739 | if ($globalDebug) echo "Add to DB..."; |
| 1740 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
|
| 1740 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH'); |
|
| 1741 | 1741 | } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
| 1742 | 1742 | if ($error != '') { |
| 1743 | 1743 | return $error; |
| 1744 | 1744 | } elseif ($globalDebug) echo "Done\n"; |
| 1745 | 1745 | if ($globalDebug) echo "Owner Austria: Download..."; |
| 1746 | - update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
|
| 1746 | + update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv'); |
|
| 1747 | 1747 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 1748 | 1748 | if ($globalDebug) echo "Add to DB..."; |
| 1749 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
|
| 1749 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE'); |
|
| 1750 | 1750 | } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
| 1751 | 1751 | if ($error != '') { |
| 1752 | 1752 | return $error; |
| 1753 | 1753 | } elseif ($globalDebug) echo "Done\n"; |
| 1754 | 1754 | if ($globalDebug) echo "Owner Chile: Download..."; |
| 1755 | - update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
|
| 1755 | + update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv'); |
|
| 1756 | 1756 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 1757 | 1757 | if ($globalDebug) echo "Add to DB..."; |
| 1758 | - $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
|
| 1758 | + $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC'); |
|
| 1759 | 1759 | } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
| 1760 | 1760 | if ($error != '') { |
| 1761 | 1761 | return $error; |
| 1762 | 1762 | } elseif ($globalDebug) echo "Done\n"; |
| 1763 | 1763 | if ($globalDebug) echo "Owner Colombia: Download..."; |
| 1764 | - update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
|
| 1764 | + update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv'); |
|
| 1765 | 1765 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 1766 | 1766 | if ($globalDebug) echo "Add to DB..."; |
| 1767 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
|
| 1767 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ'); |
|
| 1768 | 1768 | } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
| 1769 | 1769 | if ($error != '') { |
| 1770 | 1770 | return $error; |
| 1771 | 1771 | } elseif ($globalDebug) echo "Done\n"; |
| 1772 | 1772 | if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
| 1773 | - update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
|
| 1773 | + update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv'); |
|
| 1774 | 1774 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 1775 | 1775 | if ($globalDebug) echo "Add to DB..."; |
| 1776 | - $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
|
| 1776 | + $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7'); |
|
| 1777 | 1777 | } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
| 1778 | 1778 | if ($error != '') { |
| 1779 | 1779 | return $error; |
| 1780 | 1780 | } elseif ($globalDebug) echo "Done\n"; |
| 1781 | 1781 | if ($globalDebug) echo "Owner Brazil: Download..."; |
| 1782 | - update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
|
| 1782 | + update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv'); |
|
| 1783 | 1783 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 1784 | 1784 | if ($globalDebug) echo "Add to DB..."; |
| 1785 | - $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
|
| 1785 | + $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP'); |
|
| 1786 | 1786 | } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
| 1787 | 1787 | if ($error != '') { |
| 1788 | 1788 | return $error; |
| 1789 | 1789 | } elseif ($globalDebug) echo "Done\n"; |
| 1790 | 1790 | if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
| 1791 | - update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
|
| 1791 | + update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv'); |
|
| 1792 | 1792 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 1793 | 1793 | if ($globalDebug) echo "Add to DB..."; |
| 1794 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
|
| 1794 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP'); |
|
| 1795 | 1795 | } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
| 1796 | 1796 | if ($error != '') { |
| 1797 | 1797 | return $error; |
| 1798 | 1798 | } elseif ($globalDebug) echo "Done\n"; |
| 1799 | 1799 | if ($globalDebug) echo "Owner Croatia: Download..."; |
| 1800 | - update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
|
| 1800 | + update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv'); |
|
| 1801 | 1801 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 1802 | 1802 | if ($globalDebug) echo "Add to DB..."; |
| 1803 | - $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
|
| 1803 | + $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A'); |
|
| 1804 | 1804 | } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
| 1805 | 1805 | if ($error != '') { |
| 1806 | 1806 | return $error; |
| 1807 | 1807 | } elseif ($globalDebug) echo "Done\n"; |
| 1808 | 1808 | if ($globalDebug) echo "Owner Luxembourg: Download..."; |
| 1809 | - update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
|
| 1809 | + update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv'); |
|
| 1810 | 1810 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 1811 | 1811 | if ($globalDebug) echo "Add to DB..."; |
| 1812 | - $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
|
| 1812 | + $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX'); |
|
| 1813 | 1813 | } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
| 1814 | 1814 | if ($error != '') { |
| 1815 | 1815 | return $error; |
| 1816 | 1816 | } elseif ($globalDebug) echo "Done\n"; |
| 1817 | 1817 | if ($globalDebug) echo "Owner Maldives: Download..."; |
| 1818 | - update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
|
| 1818 | + update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv'); |
|
| 1819 | 1819 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 1820 | 1820 | if ($globalDebug) echo "Add to DB..."; |
| 1821 | - $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
|
| 1821 | + $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q'); |
|
| 1822 | 1822 | } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
| 1823 | 1823 | if ($error != '') { |
| 1824 | 1824 | return $error; |
| 1825 | 1825 | } elseif ($globalDebug) echo "Done\n"; |
| 1826 | 1826 | if ($globalDebug) echo "Owner New Zealand: Download..."; |
| 1827 | - update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
|
| 1827 | + update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv'); |
|
| 1828 | 1828 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 1829 | 1829 | if ($globalDebug) echo "Add to DB..."; |
| 1830 | - $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
|
| 1830 | + $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK'); |
|
| 1831 | 1831 | } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
| 1832 | 1832 | if ($error != '') { |
| 1833 | 1833 | return $error; |
| 1834 | 1834 | } elseif ($globalDebug) echo "Done\n"; |
| 1835 | 1835 | if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
| 1836 | - update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
|
| 1836 | + update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv'); |
|
| 1837 | 1837 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 1838 | 1838 | if ($globalDebug) echo "Add to DB..."; |
| 1839 | - $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
|
| 1839 | + $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2'); |
|
| 1840 | 1840 | } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
| 1841 | 1841 | if ($error != '') { |
| 1842 | 1842 | return $error; |
| 1843 | 1843 | } elseif ($globalDebug) echo "Done\n"; |
| 1844 | 1844 | if ($globalDebug) echo "Owner Slovakia: Download..."; |
| 1845 | - update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
|
| 1845 | + update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv'); |
|
| 1846 | 1846 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 1847 | 1847 | if ($globalDebug) echo "Add to DB..."; |
| 1848 | - $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
|
| 1848 | + $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM'); |
|
| 1849 | 1849 | } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
| 1850 | 1850 | if ($error != '') { |
| 1851 | 1851 | return $error; |
| 1852 | 1852 | } elseif ($globalDebug) echo "Done\n"; |
| 1853 | 1853 | if ($globalDebug) echo "Owner Ecuador: Download..."; |
| 1854 | - update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
|
| 1854 | + update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv'); |
|
| 1855 | 1855 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 1856 | 1856 | if ($globalDebug) echo "Add to DB..."; |
| 1857 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
|
| 1857 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC'); |
|
| 1858 | 1858 | } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
| 1859 | 1859 | if ($error != '') { |
| 1860 | 1860 | return $error; |
| 1861 | 1861 | } elseif ($globalDebug) echo "Done\n"; |
| 1862 | 1862 | if ($globalDebug) echo "Owner Iceland: Download..."; |
| 1863 | - update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
|
| 1863 | + update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv'); |
|
| 1864 | 1864 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 1865 | 1865 | if ($globalDebug) echo "Add to DB..."; |
| 1866 | - $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
|
| 1866 | + $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF'); |
|
| 1867 | 1867 | } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
| 1868 | 1868 | if ($error != '') { |
| 1869 | 1869 | return $error; |
| 1870 | 1870 | } elseif ($globalDebug) echo "Done\n"; |
| 1871 | 1871 | if ($globalDebug) echo "Owner Isle of Man: Download..."; |
| 1872 | - update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
|
| 1872 | + update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv'); |
|
| 1873 | 1873 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 1874 | 1874 | if ($globalDebug) echo "Add to DB..."; |
| 1875 | - $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
|
| 1875 | + $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M'); |
|
| 1876 | 1876 | } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
| 1877 | 1877 | if ($error != '') { |
| 1878 | 1878 | return $error; |
| 1879 | 1879 | } elseif ($globalDebug) echo "Done\n"; |
| 1880 | 1880 | if ($globalMasterSource) { |
| 1881 | 1881 | if ($globalDebug) echo "ModeS Netherlands: Download..."; |
| 1882 | - update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
|
| 1882 | + update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv'); |
|
| 1883 | 1883 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 1884 | 1884 | if ($globalDebug) echo "Add to DB..."; |
| 1885 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
|
| 1885 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH'); |
|
| 1886 | 1886 | } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
| 1887 | 1887 | if ($error != '') { |
| 1888 | 1888 | return $error; |
| 1889 | 1889 | } elseif ($globalDebug) echo "Done\n"; |
| 1890 | 1890 | if ($globalDebug) echo "ModeS Denmark: Download..."; |
| 1891 | - update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
|
| 1891 | + update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv'); |
|
| 1892 | 1892 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 1893 | 1893 | if ($globalDebug) echo "Add to DB..."; |
| 1894 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
|
| 1894 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY'); |
|
| 1895 | 1895 | } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
| 1896 | 1896 | if ($error != '') { |
| 1897 | 1897 | return $error; |
@@ -1904,7 +1904,7 @@ discard block |
||
| 1904 | 1904 | global $tmp_dir, $globalDebug; |
| 1905 | 1905 | $error = ''; |
| 1906 | 1906 | if ($globalDebug) echo "Translation : Download..."; |
| 1907 | - update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
|
| 1907 | + update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip'); |
|
| 1908 | 1908 | if (file_exists($tmp_dir.'translation.zip')) { |
| 1909 | 1909 | if ($globalDebug) echo "Unzip..."; |
| 1910 | 1910 | update_db::unzip($tmp_dir.'translation.zip'); |
@@ -1920,7 +1920,7 @@ discard block |
||
| 1920 | 1920 | public static function update_translation_fam() { |
| 1921 | 1921 | global $tmp_dir, $globalDebug; |
| 1922 | 1922 | if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
| 1923 | - update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
|
| 1923 | + update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz'); |
|
| 1924 | 1924 | if (file_exists($tmp_dir.'translation.tsv.gz')) { |
| 1925 | 1925 | if ($globalDebug) echo "Gunzip..."; |
| 1926 | 1926 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
@@ -1935,7 +1935,7 @@ discard block |
||
| 1935 | 1935 | public static function update_ModeS_fam() { |
| 1936 | 1936 | global $tmp_dir, $globalDebug; |
| 1937 | 1937 | if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
| 1938 | - update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
|
| 1938 | + update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz'); |
|
| 1939 | 1939 | if (file_exists($tmp_dir.'modes.tsv.gz')) { |
| 1940 | 1940 | if ($globalDebug) echo "Gunzip..."; |
| 1941 | 1941 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
@@ -1951,9 +1951,9 @@ discard block |
||
| 1951 | 1951 | global $tmp_dir, $globalDebug, $globalOwner; |
| 1952 | 1952 | if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
| 1953 | 1953 | if ($globalOwner === TRUE) { |
| 1954 | - update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 1954 | + update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 1955 | 1955 | } else { |
| 1956 | - update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 1956 | + update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 1957 | 1957 | } |
| 1958 | 1958 | if (file_exists($tmp_dir.'owners.tsv.gz')) { |
| 1959 | 1959 | if ($globalDebug) echo "Gunzip..."; |
@@ -1969,7 +1969,7 @@ discard block |
||
| 1969 | 1969 | public static function update_routes_fam() { |
| 1970 | 1970 | global $tmp_dir, $globalDebug; |
| 1971 | 1971 | if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
| 1972 | - update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
|
| 1972 | + update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz'); |
|
| 1973 | 1973 | if (file_exists($tmp_dir.'routes.tsv.gz')) { |
| 1974 | 1974 | if ($globalDebug) echo "Gunzip..."; |
| 1975 | 1975 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
@@ -1984,7 +1984,7 @@ discard block |
||
| 1984 | 1984 | public static function update_banned_fam() { |
| 1985 | 1985 | global $tmp_dir, $globalDebug; |
| 1986 | 1986 | if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
| 1987 | - update_db::download('http://data.flightairmap.fr/data/ban_eu.csv',$tmp_dir.'ban_eu.csv'); |
|
| 1987 | + update_db::download('http://data.flightairmap.fr/data/ban_eu.csv', $tmp_dir.'ban_eu.csv'); |
|
| 1988 | 1988 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 1989 | 1989 | //if ($globalDebug) echo "Gunzip..."; |
| 1990 | 1990 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
@@ -2003,18 +2003,18 @@ discard block |
||
| 2003 | 2003 | $error = ''; |
| 2004 | 2004 | if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
| 2005 | 2005 | if ($globalDBdriver == 'mysql') { |
| 2006 | - update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2006 | + update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2007 | 2007 | } else { |
| 2008 | - update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2008 | + update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2009 | 2009 | } |
| 2010 | 2010 | if (file_exists($tmp_dir.'airspace.sql.gz.md5')) { |
| 2011 | - $airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2011 | + $airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2012 | 2012 | $airspace_md5 = $airspace_md5_file[0]; |
| 2013 | 2013 | if (!update_db::check_airspace_version($airspace_md5)) { |
| 2014 | 2014 | if ($globalDBdriver == 'mysql') { |
| 2015 | - update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2015 | + update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2016 | 2016 | } else { |
| 2017 | - update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2017 | + update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2018 | 2018 | } |
| 2019 | 2019 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2020 | 2020 | if ($globalDebug) echo "Gunzip..."; |
@@ -2026,7 +2026,7 @@ discard block |
||
| 2026 | 2026 | try { |
| 2027 | 2027 | $sth = $Connection->db->prepare($query); |
| 2028 | 2028 | $sth->execute(); |
| 2029 | - } catch(PDOException $e) { |
|
| 2029 | + } catch (PDOException $e) { |
|
| 2030 | 2030 | return "error : ".$e->getMessage(); |
| 2031 | 2031 | } |
| 2032 | 2032 | } |
@@ -2044,15 +2044,15 @@ discard block |
||
| 2044 | 2044 | public static function update_tle() { |
| 2045 | 2045 | global $tmp_dir, $globalDebug; |
| 2046 | 2046 | if ($globalDebug) echo "Download TLE : Download..."; |
| 2047 | - $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', |
|
| 2048 | - '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', |
|
| 2049 | - 'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt'); |
|
| 2047 | + $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', |
|
| 2048 | + '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', |
|
| 2049 | + 'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt'); |
|
| 2050 | 2050 | foreach ($alltle as $filename) { |
| 2051 | 2051 | if ($globalDebug) echo "downloading ".$filename.'...'; |
| 2052 | - update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
|
| 2052 | + update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename); |
|
| 2053 | 2053 | if (file_exists($tmp_dir.$filename)) { |
| 2054 | 2054 | if ($globalDebug) echo "Add to DB ".$filename."..."; |
| 2055 | - $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
|
| 2055 | + $error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename)); |
|
| 2056 | 2056 | } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
| 2057 | 2057 | if ($error != '') { |
| 2058 | 2058 | echo $error."\n"; |
@@ -2065,32 +2065,32 @@ discard block |
||
| 2065 | 2065 | global $tmp_dir, $globalDebug; |
| 2066 | 2066 | $error = ''; |
| 2067 | 2067 | if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
| 2068 | - update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
|
| 2068 | + update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', $tmp_dir.'models.md5sum'); |
|
| 2069 | 2069 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2070 | 2070 | if ($globalDebug) echo "Check files...\n"; |
| 2071 | 2071 | $newmodelsdb = array(); |
| 2072 | - if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
|
| 2073 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2072 | + if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) { |
|
| 2073 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2074 | 2074 | $model = trim($row[2]); |
| 2075 | 2075 | $newmodelsdb[$model] = trim($row[0]); |
| 2076 | 2076 | } |
| 2077 | 2077 | } |
| 2078 | 2078 | $modelsdb = array(); |
| 2079 | 2079 | if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) { |
| 2080 | - if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) { |
|
| 2081 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2080 | + if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) { |
|
| 2081 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2082 | 2082 | $model = trim($row[2]); |
| 2083 | 2083 | $modelsdb[$model] = trim($row[0]); |
| 2084 | 2084 | } |
| 2085 | 2085 | } |
| 2086 | 2086 | } |
| 2087 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2087 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2088 | 2088 | foreach ($diff as $key => $value) { |
| 2089 | 2089 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
| 2090 | - update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
|
| 2090 | + update_db::download('http://data.flightairmap.fr/data/models/'.$key, dirname(__FILE__).'/../models/'.$key); |
|
| 2091 | 2091 | |
| 2092 | 2092 | } |
| 2093 | - update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2093 | + update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2094 | 2094 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2095 | 2095 | if ($error != '') { |
| 2096 | 2096 | return $error; |
@@ -2102,32 +2102,32 @@ discard block |
||
| 2102 | 2102 | global $tmp_dir, $globalDebug; |
| 2103 | 2103 | $error = ''; |
| 2104 | 2104 | if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
| 2105 | - update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
|
| 2105 | + update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum'); |
|
| 2106 | 2106 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2107 | 2107 | if ($globalDebug) echo "Check files...\n"; |
| 2108 | 2108 | $newmodelsdb = array(); |
| 2109 | - if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
|
| 2110 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2109 | + if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) { |
|
| 2110 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2111 | 2111 | $model = trim($row[2]); |
| 2112 | 2112 | $newmodelsdb[$model] = trim($row[0]); |
| 2113 | 2113 | } |
| 2114 | 2114 | } |
| 2115 | 2115 | $modelsdb = array(); |
| 2116 | 2116 | if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) { |
| 2117 | - if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) { |
|
| 2118 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2117 | + if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) { |
|
| 2118 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2119 | 2119 | $model = trim($row[2]); |
| 2120 | 2120 | $modelsdb[$model] = trim($row[0]); |
| 2121 | 2121 | } |
| 2122 | 2122 | } |
| 2123 | 2123 | } |
| 2124 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2124 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2125 | 2125 | foreach ($diff as $key => $value) { |
| 2126 | 2126 | if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
| 2127 | - update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
|
| 2127 | + update_db::download('http://data.flightairmap.fr/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key); |
|
| 2128 | 2128 | |
| 2129 | 2129 | } |
| 2130 | - update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2130 | + update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2131 | 2131 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2132 | 2132 | if ($error != '') { |
| 2133 | 2133 | return $error; |
@@ -2139,32 +2139,32 @@ discard block |
||
| 2139 | 2139 | global $tmp_dir, $globalDebug; |
| 2140 | 2140 | $error = ''; |
| 2141 | 2141 | if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
| 2142 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
|
| 2142 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum'); |
|
| 2143 | 2143 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2144 | 2144 | if ($globalDebug) echo "Check files...\n"; |
| 2145 | 2145 | $newmodelsdb = array(); |
| 2146 | - if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2147 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2146 | + if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2147 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2148 | 2148 | $model = trim($row[2]); |
| 2149 | 2149 | $newmodelsdb[$model] = trim($row[0]); |
| 2150 | 2150 | } |
| 2151 | 2151 | } |
| 2152 | 2152 | $modelsdb = array(); |
| 2153 | 2153 | if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) { |
| 2154 | - if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2155 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2154 | + if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2155 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2156 | 2156 | $model = trim($row[2]); |
| 2157 | 2157 | $modelsdb[$model] = trim($row[0]); |
| 2158 | 2158 | } |
| 2159 | 2159 | } |
| 2160 | 2160 | } |
| 2161 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2161 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2162 | 2162 | foreach ($diff as $key => $value) { |
| 2163 | 2163 | if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
| 2164 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2164 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2165 | 2165 | |
| 2166 | 2166 | } |
| 2167 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2167 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2168 | 2168 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2169 | 2169 | if ($error != '') { |
| 2170 | 2170 | return $error; |
@@ -2187,8 +2187,8 @@ discard block |
||
| 2187 | 2187 | */ |
| 2188 | 2188 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2189 | 2189 | //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
| 2190 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2191 | - $result = fread($fh,100000000); |
|
| 2190 | + $fh = fopen($tmp_dir.'aircrafts.html', "r"); |
|
| 2191 | + $result = fread($fh, 100000000); |
|
| 2192 | 2192 | //echo $result; |
| 2193 | 2193 | //var_dump(str_get_html($result)); |
| 2194 | 2194 | //print_r(self::table2array($result)); |
@@ -2206,23 +2206,23 @@ discard block |
||
| 2206 | 2206 | $Connection = new Connection(); |
| 2207 | 2207 | $sth = $Connection->db->prepare($query); |
| 2208 | 2208 | $sth->execute(); |
| 2209 | - } catch(PDOException $e) { |
|
| 2209 | + } catch (PDOException $e) { |
|
| 2210 | 2210 | return "error : ".$e->getMessage(); |
| 2211 | 2211 | } |
| 2212 | 2212 | |
| 2213 | 2213 | $error = ''; |
| 2214 | 2214 | if ($globalDebug) echo "Notam : Download..."; |
| 2215 | - update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
|
| 2215 | + update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss'); |
|
| 2216 | 2216 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2217 | - $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
|
| 2217 | + $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true); |
|
| 2218 | 2218 | foreach ($notams['channel']['item'] as $notam) { |
| 2219 | - $title = explode(':',$notam['title']); |
|
| 2219 | + $title = explode(':', $notam['title']); |
|
| 2220 | 2220 | $data['ref'] = trim($title[0]); |
| 2221 | 2221 | unset($title[0]); |
| 2222 | - $data['title'] = trim(implode(':',$title)); |
|
| 2223 | - $description = strip_tags($notam['description'],'<pre>'); |
|
| 2224 | - preg_match(':^(.*?)<pre>:',$description,$match); |
|
| 2225 | - $q = explode('/',$match[1]); |
|
| 2222 | + $data['title'] = trim(implode(':', $title)); |
|
| 2223 | + $description = strip_tags($notam['description'], '<pre>'); |
|
| 2224 | + preg_match(':^(.*?)<pre>:', $description, $match); |
|
| 2225 | + $q = explode('/', $match[1]); |
|
| 2226 | 2226 | $data['fir'] = $q[0]; |
| 2227 | 2227 | $data['code'] = $q[1]; |
| 2228 | 2228 | $ifrvfr = $q[2]; |
@@ -2238,30 +2238,30 @@ discard block |
||
| 2238 | 2238 | $data['lower_limit'] = $q[5]; |
| 2239 | 2239 | $data['upper_limit'] = $q[6]; |
| 2240 | 2240 | $latlonrad = $q[7]; |
| 2241 | - sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
|
| 2242 | - $latitude = $Common->convertDec($las,'latitude'); |
|
| 2243 | - $longitude = $Common->convertDec($lns,'longitude'); |
|
| 2241 | + sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius); |
|
| 2242 | + $latitude = $Common->convertDec($las, 'latitude'); |
|
| 2243 | + $longitude = $Common->convertDec($lns, 'longitude'); |
|
| 2244 | 2244 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 2245 | 2245 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 2246 | 2246 | $data['center_latitude'] = $latitude; |
| 2247 | 2247 | $data['center_longitude'] = $longitude; |
| 2248 | 2248 | $data['radius'] = intval($radius); |
| 2249 | 2249 | |
| 2250 | - preg_match(':<pre>(.*?)</pre>:',$description,$match); |
|
| 2250 | + preg_match(':<pre>(.*?)</pre>:', $description, $match); |
|
| 2251 | 2251 | $data['text'] = $match[1]; |
| 2252 | - preg_match(':</pre>(.*?)$:',$description,$match); |
|
| 2252 | + preg_match(':</pre>(.*?)$:', $description, $match); |
|
| 2253 | 2253 | $fromto = $match[1]; |
| 2254 | - preg_match('#FROM:(.*?)TO:#',$fromto,$match); |
|
| 2254 | + preg_match('#FROM:(.*?)TO:#', $fromto, $match); |
|
| 2255 | 2255 | $fromall = trim($match[1]); |
| 2256 | - preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match); |
|
| 2256 | + preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match); |
|
| 2257 | 2257 | $from = trim($match[1]); |
| 2258 | - $data['date_begin'] = date("Y-m-d H:i:s",strtotime($from)); |
|
| 2259 | - preg_match('#TO:(.*?)$#',$fromto,$match); |
|
| 2258 | + $data['date_begin'] = date("Y-m-d H:i:s", strtotime($from)); |
|
| 2259 | + preg_match('#TO:(.*?)$#', $fromto, $match); |
|
| 2260 | 2260 | $toall = trim($match[1]); |
| 2261 | - if (!preg_match(':Permanent:',$toall)) { |
|
| 2262 | - preg_match('#^(.*?) \((.*?)\)#',$toall,$match); |
|
| 2261 | + if (!preg_match(':Permanent:', $toall)) { |
|
| 2262 | + preg_match('#^(.*?) \((.*?)\)#', $toall, $match); |
|
| 2263 | 2263 | $to = trim($match[1]); |
| 2264 | - $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
|
| 2264 | + $data['date_end'] = date("Y-m-d H:i:s", strtotime($to)); |
|
| 2265 | 2265 | $data['permanent'] = 0; |
| 2266 | 2266 | } else { |
| 2267 | 2267 | $data['date_end'] = NULL; |
@@ -2269,7 +2269,7 @@ discard block |
||
| 2269 | 2269 | } |
| 2270 | 2270 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2271 | 2271 | $NOTAM = new NOTAM(); |
| 2272 | - $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']); |
|
| 2272 | + $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']); |
|
| 2273 | 2273 | unset($data); |
| 2274 | 2274 | } |
| 2275 | 2275 | } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
@@ -2292,16 +2292,16 @@ discard block |
||
| 2292 | 2292 | $Connection = new Connection(); |
| 2293 | 2293 | $sth = $Connection->db->prepare($query); |
| 2294 | 2294 | $sth->execute(); |
| 2295 | - } catch(PDOException $e) { |
|
| 2295 | + } catch (PDOException $e) { |
|
| 2296 | 2296 | return "error : ".$e->getMessage(); |
| 2297 | 2297 | } |
| 2298 | 2298 | } |
| 2299 | 2299 | $Common = new Common(); |
| 2300 | 2300 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 2301 | - $airspace_json = json_decode($airspace_lst,true); |
|
| 2301 | + $airspace_json = json_decode($airspace_lst, true); |
|
| 2302 | 2302 | foreach ($airspace_json['records'] as $airspace) { |
| 2303 | 2303 | if ($globalDebug) echo $airspace['name']."...\n"; |
| 2304 | - update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
|
| 2304 | + update_db::download($airspace['uri'], $tmp_dir.$airspace['name']); |
|
| 2305 | 2305 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 2306 | 2306 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
| 2307 | 2307 | //system('recode l9..utf8 '.$tmp_dir.$airspace['name']); |
@@ -2323,7 +2323,7 @@ discard block |
||
| 2323 | 2323 | $Connection = new Connection(); |
| 2324 | 2324 | $sth = $Connection->db->prepare($query); |
| 2325 | 2325 | $sth->execute(array(':new' => $new, ':old' => $old)); |
| 2326 | - } catch(PDOException $e) { |
|
| 2326 | + } catch (PDOException $e) { |
|
| 2327 | 2327 | return "error : ".$e->getMessage(); |
| 2328 | 2328 | } |
| 2329 | 2329 | } |
@@ -2340,7 +2340,7 @@ discard block |
||
| 2340 | 2340 | $Connection = new Connection(); |
| 2341 | 2341 | $sth = $Connection->db->prepare($query); |
| 2342 | 2342 | $sth->execute(); |
| 2343 | - } catch(PDOException $e) { |
|
| 2343 | + } catch (PDOException $e) { |
|
| 2344 | 2344 | return "error : ".$e->getMessage(); |
| 2345 | 2345 | } |
| 2346 | 2346 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2355,7 +2355,7 @@ discard block |
||
| 2355 | 2355 | $Connection = new Connection(); |
| 2356 | 2356 | $sth = $Connection->db->prepare($query); |
| 2357 | 2357 | $sth->execute(); |
| 2358 | - } catch(PDOException $e) { |
|
| 2358 | + } catch (PDOException $e) { |
|
| 2359 | 2359 | return "error : ".$e->getMessage(); |
| 2360 | 2360 | } |
| 2361 | 2361 | } |
@@ -2366,7 +2366,7 @@ discard block |
||
| 2366 | 2366 | $Connection = new Connection(); |
| 2367 | 2367 | $sth = $Connection->db->prepare($query); |
| 2368 | 2368 | $sth->execute(array(':version' => $version)); |
| 2369 | - } catch(PDOException $e) { |
|
| 2369 | + } catch (PDOException $e) { |
|
| 2370 | 2370 | return "error : ".$e->getMessage(); |
| 2371 | 2371 | } |
| 2372 | 2372 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2382,7 +2382,7 @@ discard block |
||
| 2382 | 2382 | $Connection = new Connection(); |
| 2383 | 2383 | $sth = $Connection->db->prepare($query); |
| 2384 | 2384 | $sth->execute(array(':version' => $version)); |
| 2385 | - } catch(PDOException $e) { |
|
| 2385 | + } catch (PDOException $e) { |
|
| 2386 | 2386 | return "error : ".$e->getMessage(); |
| 2387 | 2387 | } |
| 2388 | 2388 | } |
@@ -2398,7 +2398,7 @@ discard block |
||
| 2398 | 2398 | $Connection = new Connection(); |
| 2399 | 2399 | $sth = $Connection->db->prepare($query); |
| 2400 | 2400 | $sth->execute(); |
| 2401 | - } catch(PDOException $e) { |
|
| 2401 | + } catch (PDOException $e) { |
|
| 2402 | 2402 | return "error : ".$e->getMessage(); |
| 2403 | 2403 | } |
| 2404 | 2404 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2413,7 +2413,7 @@ discard block |
||
| 2413 | 2413 | $Connection = new Connection(); |
| 2414 | 2414 | $sth = $Connection->db->prepare($query); |
| 2415 | 2415 | $sth->execute(); |
| 2416 | - } catch(PDOException $e) { |
|
| 2416 | + } catch (PDOException $e) { |
|
| 2417 | 2417 | return "error : ".$e->getMessage(); |
| 2418 | 2418 | } |
| 2419 | 2419 | } |
@@ -2428,7 +2428,7 @@ discard block |
||
| 2428 | 2428 | $Connection = new Connection(); |
| 2429 | 2429 | $sth = $Connection->db->prepare($query); |
| 2430 | 2430 | $sth->execute(); |
| 2431 | - } catch(PDOException $e) { |
|
| 2431 | + } catch (PDOException $e) { |
|
| 2432 | 2432 | return "error : ".$e->getMessage(); |
| 2433 | 2433 | } |
| 2434 | 2434 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2443,7 +2443,7 @@ discard block |
||
| 2443 | 2443 | $Connection = new Connection(); |
| 2444 | 2444 | $sth = $Connection->db->prepare($query); |
| 2445 | 2445 | $sth->execute(); |
| 2446 | - } catch(PDOException $e) { |
|
| 2446 | + } catch (PDOException $e) { |
|
| 2447 | 2447 | return "error : ".$e->getMessage(); |
| 2448 | 2448 | } |
| 2449 | 2449 | } |
@@ -2459,7 +2459,7 @@ discard block |
||
| 2459 | 2459 | $Connection = new Connection(); |
| 2460 | 2460 | $sth = $Connection->db->prepare($query); |
| 2461 | 2461 | $sth->execute(); |
| 2462 | - } catch(PDOException $e) { |
|
| 2462 | + } catch (PDOException $e) { |
|
| 2463 | 2463 | return "error : ".$e->getMessage(); |
| 2464 | 2464 | } |
| 2465 | 2465 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2474,7 +2474,7 @@ discard block |
||
| 2474 | 2474 | $Connection = new Connection(); |
| 2475 | 2475 | $sth = $Connection->db->prepare($query); |
| 2476 | 2476 | $sth->execute(); |
| 2477 | - } catch(PDOException $e) { |
|
| 2477 | + } catch (PDOException $e) { |
|
| 2478 | 2478 | return "error : ".$e->getMessage(); |
| 2479 | 2479 | } |
| 2480 | 2480 | } |
@@ -2489,7 +2489,7 @@ discard block |
||
| 2489 | 2489 | $Connection = new Connection(); |
| 2490 | 2490 | $sth = $Connection->db->prepare($query); |
| 2491 | 2491 | $sth->execute(); |
| 2492 | - } catch(PDOException $e) { |
|
| 2492 | + } catch (PDOException $e) { |
|
| 2493 | 2493 | return "error : ".$e->getMessage(); |
| 2494 | 2494 | } |
| 2495 | 2495 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2504,7 +2504,7 @@ discard block |
||
| 2504 | 2504 | $Connection = new Connection(); |
| 2505 | 2505 | $sth = $Connection->db->prepare($query); |
| 2506 | 2506 | $sth->execute(); |
| 2507 | - } catch(PDOException $e) { |
|
| 2507 | + } catch (PDOException $e) { |
|
| 2508 | 2508 | return "error : ".$e->getMessage(); |
| 2509 | 2509 | } |
| 2510 | 2510 | } |
@@ -2519,7 +2519,7 @@ discard block |
||
| 2519 | 2519 | $Connection = new Connection(); |
| 2520 | 2520 | $sth = $Connection->db->prepare($query); |
| 2521 | 2521 | $sth->execute(); |
| 2522 | - } catch(PDOException $e) { |
|
| 2522 | + } catch (PDOException $e) { |
|
| 2523 | 2523 | return "error : ".$e->getMessage(); |
| 2524 | 2524 | } |
| 2525 | 2525 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2534,7 +2534,7 @@ discard block |
||
| 2534 | 2534 | $Connection = new Connection(); |
| 2535 | 2535 | $sth = $Connection->db->prepare($query); |
| 2536 | 2536 | $sth->execute(); |
| 2537 | - } catch(PDOException $e) { |
|
| 2537 | + } catch (PDOException $e) { |
|
| 2538 | 2538 | return "error : ".$e->getMessage(); |
| 2539 | 2539 | } |
| 2540 | 2540 | } |
@@ -2549,7 +2549,7 @@ discard block |
||
| 2549 | 2549 | $Connection = new Connection(); |
| 2550 | 2550 | $sth = $Connection->db->prepare($query); |
| 2551 | 2551 | $sth->execute(); |
| 2552 | - } catch(PDOException $e) { |
|
| 2552 | + } catch (PDOException $e) { |
|
| 2553 | 2553 | return "error : ".$e->getMessage(); |
| 2554 | 2554 | } |
| 2555 | 2555 | } |
@@ -2564,7 +2564,7 @@ discard block |
||
| 2564 | 2564 | $Connection = new Connection(); |
| 2565 | 2565 | $sth = $Connection->db->prepare($query); |
| 2566 | 2566 | $sth->execute(); |
| 2567 | - } catch(PDOException $e) { |
|
| 2567 | + } catch (PDOException $e) { |
|
| 2568 | 2568 | return "error : ".$e->getMessage(); |
| 2569 | 2569 | } |
| 2570 | 2570 | } |
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | try { |
| 15 | 15 | $sth = $Connection->db->prepare($query); |
| 16 | 16 | $sth->execute(); |
| 17 | - } catch(PDOException $e) { |
|
| 17 | + } catch (PDOException $e) { |
|
| 18 | 18 | return "error : ".$e->getMessage()."\n"; |
| 19 | 19 | } |
| 20 | 20 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 21 | - $Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']); |
|
| 21 | + $Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | try { |
| 51 | 51 | $sth = $Connection->db->prepare($query); |
| 52 | 52 | $sth->execute(); |
| 53 | - } catch(PDOException $e) { |
|
| 53 | + } catch (PDOException $e) { |
|
| 54 | 54 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 55 | 55 | } |
| 56 | 56 | // Copy schedules data to routes table |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | try { |
| 61 | 61 | $sth = $Connection->db->prepare($query); |
| 62 | 62 | $sth->execute(); |
| 63 | - } catch(PDOException $e) { |
|
| 63 | + } catch (PDOException $e) { |
|
| 64 | 64 | return "error (delete schedule table) : ".$e->getMessage()."\n"; |
| 65 | 65 | } |
| 66 | 66 | // Add source column |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | try { |
| 69 | 69 | $sth = $Connection->db->prepare($query); |
| 70 | 70 | $sth->execute(); |
| 71 | - } catch(PDOException $e) { |
|
| 71 | + } catch (PDOException $e) { |
|
| 72 | 72 | return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
| 73 | 73 | } |
| 74 | 74 | // Delete unused column |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | try { |
| 77 | 77 | $sth = $Connection->db->prepare($query); |
| 78 | 78 | $sth->execute(); |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
| 81 | 81 | } |
| 82 | 82 | // Add ModeS column |
@@ -84,14 +84,14 @@ discard block |
||
| 84 | 84 | try { |
| 85 | 85 | $sth = $Connection->db->prepare($query); |
| 86 | 86 | $sth->execute(); |
| 87 | - } catch(PDOException $e) { |
|
| 87 | + } catch (PDOException $e) { |
|
| 88 | 88 | return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
| 89 | 89 | } |
| 90 | 90 | $query = "ALTER TABLE `spotter_live` ADD `ModeS` VARCHAR(255)"; |
| 91 | 91 | try { |
| 92 | 92 | $sth = $Connection->db->prepare($query); |
| 93 | 93 | $sth->execute(); |
| 94 | - } catch(PDOException $e) { |
|
| 94 | + } catch (PDOException $e) { |
|
| 95 | 95 | return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
| 96 | 96 | } |
| 97 | 97 | // Add auto_increment for aircraft_modes |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | try { |
| 100 | 100 | $sth = $Connection->db->prepare($query); |
| 101 | 101 | $sth->execute(); |
| 102 | - } catch(PDOException $e) { |
|
| 102 | + } catch (PDOException $e) { |
|
| 103 | 103 | return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
| 104 | 104 | } |
| 105 | 105 | $error = ''; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | try { |
| 111 | 111 | $sth = $Connection->db->prepare($query); |
| 112 | 112 | $sth->execute(); |
| 113 | - } catch(PDOException $e) { |
|
| 113 | + } catch (PDOException $e) { |
|
| 114 | 114 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 115 | 115 | } |
| 116 | 116 | return $error; |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | try { |
| 124 | 124 | $sth = $Connection->db->prepare($query); |
| 125 | 125 | $sth->execute(); |
| 126 | - } catch(PDOException $e) { |
|
| 126 | + } catch (PDOException $e) { |
|
| 127 | 127 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 128 | 128 | } |
| 129 | 129 | $error = ''; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | try { |
| 135 | 135 | $sth = $Connection->db->prepare($query); |
| 136 | 136 | $sth->execute(); |
| 137 | - } catch(PDOException $e) { |
|
| 137 | + } catch (PDOException $e) { |
|
| 138 | 138 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 139 | 139 | } |
| 140 | 140 | return $error; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | try { |
| 148 | 148 | $sth = $Connection->db->prepare($query); |
| 149 | 149 | $sth->execute(); |
| 150 | - } catch(PDOException $e) { |
|
| 150 | + } catch (PDOException $e) { |
|
| 151 | 151 | return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
| 152 | 152 | } |
| 153 | 153 | // Add image_source_website column to spotter_image |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | try { |
| 156 | 156 | $sth = $Connection->db->prepare($query); |
| 157 | 157 | $sth->execute(); |
| 158 | - } catch(PDOException $e) { |
|
| 158 | + } catch (PDOException $e) { |
|
| 159 | 159 | return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
| 160 | 160 | } |
| 161 | 161 | $error = ''; |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | try { |
| 165 | 165 | $sth = $Connection->db->prepare($query); |
| 166 | 166 | $sth->execute(); |
| 167 | - } catch(PDOException $e) { |
|
| 167 | + } catch (PDOException $e) { |
|
| 168 | 168 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 169 | 169 | } |
| 170 | 170 | return $error; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | try { |
| 183 | 183 | $sth = $Connection->db->prepare($query); |
| 184 | 184 | $sth->execute(); |
| 185 | - } catch(PDOException $e) { |
|
| 185 | + } catch (PDOException $e) { |
|
| 186 | 186 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 187 | 187 | } |
| 188 | 188 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | try { |
| 197 | 197 | $sth = $Connection->db->prepare($query); |
| 198 | 198 | $sth->execute(); |
| 199 | - } catch(PDOException $e) { |
|
| 199 | + } catch (PDOException $e) { |
|
| 200 | 200 | return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
| 201 | 201 | } |
| 202 | 202 | // Add aircraft_shadow column to aircraft |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | try { |
| 205 | 205 | $sth = $Connection->db->prepare($query); |
| 206 | 206 | $sth->execute(); |
| 207 | - } catch(PDOException $e) { |
|
| 207 | + } catch (PDOException $e) { |
|
| 208 | 208 | return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
| 209 | 209 | } |
| 210 | 210 | // Add aircraft_shadow column to spotter_live |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | try { |
| 213 | 213 | $sth = $Connection->db->prepare($query); |
| 214 | 214 | $sth->execute(); |
| 215 | - } catch(PDOException $e) { |
|
| 215 | + } catch (PDOException $e) { |
|
| 216 | 216 | return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
| 217 | 217 | } |
| 218 | 218 | $error = ''; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | try { |
| 226 | 226 | $sth = $Connection->db->prepare($query); |
| 227 | 227 | $sth->execute(); |
| 228 | - } catch(PDOException $e) { |
|
| 228 | + } catch (PDOException $e) { |
|
| 229 | 229 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 230 | 230 | } |
| 231 | 231 | return $error; |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | |
| 234 | 234 | private static function update_from_6() { |
| 235 | 235 | $Connection = new Connection(); |
| 236 | - if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 236 | + if (!$Connection->indexExists('spotter_output', 'flightaware_id')) { |
|
| 237 | 237 | $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id); |
| 238 | 238 | ALTER TABLE spotter_output ADD INDEX(date); |
| 239 | 239 | ALTER TABLE spotter_output ADD INDEX(ident); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | try { |
| 251 | 251 | $sth = $Connection->db->prepare($query); |
| 252 | 252 | $sth->execute(); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch (PDOException $e) { |
|
| 254 | 254 | return "error (add some indexes) : ".$e->getMessage()."\n"; |
| 255 | 255 | } |
| 256 | 256 | } |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | try { |
| 266 | 266 | $sth = $Connection->db->prepare($query); |
| 267 | 267 | $sth->execute(); |
| 268 | - } catch(PDOException $e) { |
|
| 268 | + } catch (PDOException $e) { |
|
| 269 | 269 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 270 | 270 | } |
| 271 | 271 | return $error; |
@@ -274,12 +274,12 @@ discard block |
||
| 274 | 274 | private static function update_from_7() { |
| 275 | 275 | global $globalDBname, $globalDBdriver; |
| 276 | 276 | $Connection = new Connection(); |
| 277 | - $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 277 | + $query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 278 | 278 | ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;"; |
| 279 | 279 | try { |
| 280 | 280 | $sth = $Connection->db->prepare($query); |
| 281 | 281 | $sth->execute(); |
| 282 | - } catch(PDOException $e) { |
|
| 282 | + } catch (PDOException $e) { |
|
| 283 | 283 | return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 284 | 284 | } |
| 285 | 285 | if ($globalDBdriver == 'mysql') { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | try { |
| 288 | 288 | $sth = $Connection->db->prepare($query); |
| 289 | 289 | $sth->execute(); |
| 290 | - } catch(PDOException $e) { |
|
| 290 | + } catch (PDOException $e) { |
|
| 291 | 291 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 292 | 292 | } |
| 293 | 293 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -299,15 +299,15 @@ discard block |
||
| 299 | 299 | DROP TABLE spotter_archive; |
| 300 | 300 | RENAME TABLE copy TO spotter_archive;"; |
| 301 | 301 | } else { |
| 302 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 302 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | 303 | } |
| 304 | 304 | } else { |
| 305 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 305 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | 306 | } |
| 307 | 307 | try { |
| 308 | 308 | $sth = $Connection->db->prepare($query); |
| 309 | 309 | $sth->execute(); |
| 310 | - } catch(PDOException $e) { |
|
| 310 | + } catch (PDOException $e) { |
|
| 311 | 311 | return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
| 312 | 312 | } |
| 313 | 313 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | try { |
| 321 | 321 | $sth = $Connection->db->prepare($query); |
| 322 | 322 | $sth->execute(); |
| 323 | - } catch(PDOException $e) { |
|
| 323 | + } catch (PDOException $e) { |
|
| 324 | 324 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 325 | 325 | } |
| 326 | 326 | return $error; |
@@ -339,14 +339,14 @@ discard block |
||
| 339 | 339 | try { |
| 340 | 340 | $sth = $Connection->db->prepare($query); |
| 341 | 341 | $sth->execute(); |
| 342 | - } catch(PDOException $e) { |
|
| 342 | + } catch (PDOException $e) { |
|
| 343 | 343 | return "error (insert last_update values) : ".$e->getMessage()."\n"; |
| 344 | 344 | } |
| 345 | 345 | $query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'"; |
| 346 | 346 | try { |
| 347 | 347 | $sth = $Connection->db->prepare($query); |
| 348 | 348 | $sth->execute(); |
| 349 | - } catch(PDOException $e) { |
|
| 349 | + } catch (PDOException $e) { |
|
| 350 | 350 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 351 | 351 | } |
| 352 | 352 | return $error; |
@@ -354,12 +354,12 @@ discard block |
||
| 354 | 354 | |
| 355 | 355 | private static function update_from_9() { |
| 356 | 356 | $Connection = new Connection(); |
| 357 | - $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 357 | + $query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 358 | 358 | ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;"; |
| 359 | 359 | try { |
| 360 | 360 | $sth = $Connection->db->prepare($query); |
| 361 | 361 | $sth->execute(); |
| 362 | - } catch(PDOException $e) { |
|
| 362 | + } catch (PDOException $e) { |
|
| 363 | 363 | return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 364 | 364 | } |
| 365 | 365 | $error = ''; |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | try { |
| 372 | 372 | $sth = $Connection->db->prepare($query); |
| 373 | 373 | $sth->execute(); |
| 374 | - } catch(PDOException $e) { |
|
| 374 | + } catch (PDOException $e) { |
|
| 375 | 375 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 376 | 376 | } |
| 377 | 377 | return $error; |
@@ -379,11 +379,11 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | private static function update_from_10() { |
| 381 | 381 | $Connection = new Connection(); |
| 382 | - $query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 382 | + $query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 383 | 383 | try { |
| 384 | 384 | $sth = $Connection->db->prepare($query); |
| 385 | 385 | $sth->execute(); |
| 386 | - } catch(PDOException $e) { |
|
| 386 | + } catch (PDOException $e) { |
|
| 387 | 387 | return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
| 388 | 388 | } |
| 389 | 389 | $error = ''; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | try { |
| 402 | 402 | $sth = $Connection->db->prepare($query); |
| 403 | 403 | $sth->execute(); |
| 404 | - } catch(PDOException $e) { |
|
| 404 | + } catch (PDOException $e) { |
|
| 405 | 405 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 406 | 406 | } |
| 407 | 407 | return $error; |
@@ -410,18 +410,18 @@ discard block |
||
| 410 | 410 | private static function update_from_11() { |
| 411 | 411 | global $globalDBdriver, $globalDBname; |
| 412 | 412 | $Connection = new Connection(); |
| 413 | - $query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 413 | + $query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 414 | 414 | try { |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | 416 | $sth->execute(); |
| 417 | - } catch(PDOException $e) { |
|
| 417 | + } catch (PDOException $e) { |
|
| 418 | 418 | return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
| 419 | 419 | } |
| 420 | - $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 420 | + $query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | 421 | try { |
| 422 | 422 | $sth = $Connection->db->prepare($query); |
| 423 | 423 | $sth->execute(); |
| 424 | - } catch(PDOException $e) { |
|
| 424 | + } catch (PDOException $e) { |
|
| 425 | 425 | return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
| 426 | 426 | } |
| 427 | 427 | if ($globalDBdriver == 'mysql') { |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | try { |
| 430 | 430 | $sth = $Connection->db->prepare($query); |
| 431 | 431 | $sth->execute(); |
| 432 | - } catch(PDOException $e) { |
|
| 432 | + } catch (PDOException $e) { |
|
| 433 | 433 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 434 | 434 | } |
| 435 | 435 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -441,15 +441,15 @@ discard block |
||
| 441 | 441 | DROP TABLE spotter_archive; |
| 442 | 442 | RENAME TABLE copy TO spotter_archive;"; |
| 443 | 443 | } else { |
| 444 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 444 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 445 | 445 | } |
| 446 | 446 | } else { |
| 447 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 447 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 448 | 448 | } |
| 449 | 449 | try { |
| 450 | 450 | $sth = $Connection->db->prepare($query); |
| 451 | 451 | $sth->execute(); |
| 452 | - } catch(PDOException $e) { |
|
| 452 | + } catch (PDOException $e) { |
|
| 453 | 453 | return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
| 454 | 454 | } |
| 455 | 455 | |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | try { |
| 460 | 460 | $sth = $Connection->db->prepare($query); |
| 461 | 461 | $sth->execute(); |
| 462 | - } catch(PDOException $e) { |
|
| 462 | + } catch (PDOException $e) { |
|
| 463 | 463 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 464 | 464 | } |
| 465 | 465 | return $error; |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | try { |
| 488 | 488 | $sth = $Connection->db->prepare($query); |
| 489 | 489 | $sth->execute(); |
| 490 | - } catch(PDOException $e) { |
|
| 490 | + } catch (PDOException $e) { |
|
| 491 | 491 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 492 | 492 | } |
| 493 | 493 | return $error; |
@@ -495,12 +495,12 @@ discard block |
||
| 495 | 495 | |
| 496 | 496 | private static function update_from_13() { |
| 497 | 497 | $Connection = new Connection(); |
| 498 | - if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) { |
|
| 499 | - $query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 498 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) { |
|
| 499 | + $query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 500 | 500 | try { |
| 501 | 501 | $sth = $Connection->db->prepare($query); |
| 502 | 502 | $sth->execute(); |
| 503 | - } catch(PDOException $e) { |
|
| 503 | + } catch (PDOException $e) { |
|
| 504 | 504 | return "error (update spotter_archive_output) : ".$e->getMessage()."\n"; |
| 505 | 505 | } |
| 506 | 506 | } |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | try { |
| 510 | 510 | $sth = $Connection->db->prepare($query); |
| 511 | 511 | $sth->execute(); |
| 512 | - } catch(PDOException $e) { |
|
| 512 | + } catch (PDOException $e) { |
|
| 513 | 513 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 514 | 514 | } |
| 515 | 515 | return $error; |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | try { |
| 528 | 528 | $sth = $Connection->db->prepare($query); |
| 529 | 529 | $sth->execute(); |
| 530 | - } catch(PDOException $e) { |
|
| 530 | + } catch (PDOException $e) { |
|
| 531 | 531 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 532 | 532 | } |
| 533 | 533 | return $error; |
@@ -538,11 +538,11 @@ discard block |
||
| 538 | 538 | $Connection = new Connection(); |
| 539 | 539 | $error = ''; |
| 540 | 540 | // Add tables |
| 541 | - $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 541 | + $query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | 542 | try { |
| 543 | 543 | $sth = $Connection->db->prepare($query); |
| 544 | 544 | $sth->execute(); |
| 545 | - } catch(PDOException $e) { |
|
| 545 | + } catch (PDOException $e) { |
|
| 546 | 546 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 547 | } |
| 548 | 548 | if ($error != '') return $error; |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | try { |
| 551 | 551 | $sth = $Connection->db->prepare($query); |
| 552 | 552 | $sth->execute(); |
| 553 | - } catch(PDOException $e) { |
|
| 553 | + } catch (PDOException $e) { |
|
| 554 | 554 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 555 | 555 | } |
| 556 | 556 | return $error; |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | try { |
| 572 | 572 | $sth = $Connection->db->prepare($query); |
| 573 | 573 | $sth->execute(); |
| 574 | - } catch(PDOException $e) { |
|
| 574 | + } catch (PDOException $e) { |
|
| 575 | 575 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 576 | 576 | } |
| 577 | 577 | return $error; |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | try { |
| 590 | 590 | $sth = $Connection->db->prepare($query); |
| 591 | 591 | $sth->execute(); |
| 592 | - } catch(PDOException $e) { |
|
| 592 | + } catch (PDOException $e) { |
|
| 593 | 593 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 594 | 594 | } |
| 595 | 595 | return $error; |
@@ -598,12 +598,12 @@ discard block |
||
| 598 | 598 | $Connection = new Connection(); |
| 599 | 599 | $error = ''; |
| 600 | 600 | // Modify stats_airport table |
| 601 | - if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 601 | + if (!$Connection->checkColumnName('stats_airport', 'airport_name')) { |
|
| 602 | 602 | $query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)"; |
| 603 | 603 | try { |
| 604 | 604 | $sth = $Connection->db->prepare($query); |
| 605 | 605 | $sth->execute(); |
| 606 | - } catch(PDOException $e) { |
|
| 606 | + } catch (PDOException $e) { |
|
| 607 | 607 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 608 | } |
| 609 | 609 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | try { |
| 613 | 613 | $sth = $Connection->db->prepare($query); |
| 614 | 614 | $sth->execute(); |
| 615 | - } catch(PDOException $e) { |
|
| 615 | + } catch (PDOException $e) { |
|
| 616 | 616 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 617 | 617 | } |
| 618 | 618 | return $error; |
@@ -629,73 +629,73 @@ discard block |
||
| 629 | 629 | try { |
| 630 | 630 | $sth = $Connection->db->prepare($query); |
| 631 | 631 | $sth->execute(); |
| 632 | - } catch(PDOException $e) { |
|
| 632 | + } catch (PDOException $e) { |
|
| 633 | 633 | return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
| 634 | 634 | } |
| 635 | 635 | $query = "alter table spotter_archive add spotter_archive_id INT(11)"; |
| 636 | 636 | try { |
| 637 | 637 | $sth = $Connection->db->prepare($query); |
| 638 | 638 | $sth->execute(); |
| 639 | - } catch(PDOException $e) { |
|
| 639 | + } catch (PDOException $e) { |
|
| 640 | 640 | return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
| 641 | 641 | } |
| 642 | - if (!$Connection->checkColumnName('spotter_archive','over_country')) { |
|
| 642 | + if (!$Connection->checkColumnName('spotter_archive', 'over_country')) { |
|
| 643 | 643 | // Add column over_country |
| 644 | 644 | $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 645 | 645 | try { |
| 646 | 646 | $sth = $Connection->db->prepare($query); |
| 647 | 647 | $sth->execute(); |
| 648 | - } catch(PDOException $e) { |
|
| 648 | + } catch (PDOException $e) { |
|
| 649 | 649 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 650 | 650 | } |
| 651 | 651 | } |
| 652 | - if (!$Connection->checkColumnName('spotter_live','over_country')) { |
|
| 652 | + if (!$Connection->checkColumnName('spotter_live', 'over_country')) { |
|
| 653 | 653 | // Add column over_country |
| 654 | 654 | $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 655 | 655 | try { |
| 656 | 656 | $sth = $Connection->db->prepare($query); |
| 657 | 657 | $sth->execute(); |
| 658 | - } catch(PDOException $e) { |
|
| 658 | + } catch (PDOException $e) { |
|
| 659 | 659 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | - if (!$Connection->checkColumnName('spotter_output','source_name')) { |
|
| 662 | + if (!$Connection->checkColumnName('spotter_output', 'source_name')) { |
|
| 663 | 663 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 664 | 664 | $query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 665 | 665 | try { |
| 666 | 666 | $sth = $Connection->db->prepare($query); |
| 667 | 667 | $sth->execute(); |
| 668 | - } catch(PDOException $e) { |
|
| 668 | + } catch (PDOException $e) { |
|
| 669 | 669 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 670 | 670 | } |
| 671 | 671 | } |
| 672 | - if (!$Connection->checkColumnName('spotter_live','source_name')) { |
|
| 672 | + if (!$Connection->checkColumnName('spotter_live', 'source_name')) { |
|
| 673 | 673 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 674 | 674 | $query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 675 | 675 | try { |
| 676 | 676 | $sth = $Connection->db->prepare($query); |
| 677 | 677 | $sth->execute(); |
| 678 | - } catch(PDOException $e) { |
|
| 678 | + } catch (PDOException $e) { |
|
| 679 | 679 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | - if (!$Connection->checkColumnName('spotter_archive_output','source_name')) { |
|
| 682 | + if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) { |
|
| 683 | 683 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 684 | 684 | $query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 685 | 685 | try { |
| 686 | 686 | $sth = $Connection->db->prepare($query); |
| 687 | 687 | $sth->execute(); |
| 688 | - } catch(PDOException $e) { |
|
| 688 | + } catch (PDOException $e) { |
|
| 689 | 689 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 690 | 690 | } |
| 691 | 691 | } |
| 692 | - if (!$Connection->checkColumnName('spotter_archive','source_name')) { |
|
| 692 | + if (!$Connection->checkColumnName('spotter_archive', 'source_name')) { |
|
| 693 | 693 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 694 | 694 | $query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;"; |
| 695 | 695 | try { |
| 696 | 696 | $sth = $Connection->db->prepare($query); |
| 697 | 697 | $sth->execute(); |
| 698 | - } catch(PDOException $e) { |
|
| 698 | + } catch (PDOException $e) { |
|
| 699 | 699 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 700 | } |
| 701 | 701 | } |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | try { |
| 705 | 705 | $sth = $Connection->db->prepare($query); |
| 706 | 706 | $sth->execute(); |
| 707 | - } catch(PDOException $e) { |
|
| 707 | + } catch (PDOException $e) { |
|
| 708 | 708 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 709 | 709 | } |
| 710 | 710 | return $error; |
@@ -719,13 +719,13 @@ discard block |
||
| 719 | 719 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | 720 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 721 | 721 | } |
| 722 | - if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
|
| 722 | + if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) { |
|
| 723 | 723 | // Add column over_country |
| 724 | 724 | $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
| 725 | 725 | try { |
| 726 | 726 | $sth = $Connection->db->prepare($query); |
| 727 | 727 | $sth->execute(); |
| 728 | - } catch(PDOException $e) { |
|
| 728 | + } catch (PDOException $e) { |
|
| 729 | 729 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 730 | } |
| 731 | 731 | } |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | try { |
| 742 | 742 | $sth = $Connection->db->prepare($query); |
| 743 | 743 | $sth->execute(); |
| 744 | - } catch(PDOException $e) { |
|
| 744 | + } catch (PDOException $e) { |
|
| 745 | 745 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 746 | 746 | } |
| 747 | 747 | return $error; |
@@ -750,13 +750,13 @@ discard block |
||
| 750 | 750 | private static function update_from_21() { |
| 751 | 751 | $Connection = new Connection(); |
| 752 | 752 | $error = ''; |
| 753 | - if (!$Connection->checkColumnName('stats_airport','stats_type')) { |
|
| 753 | + if (!$Connection->checkColumnName('stats_airport', 'stats_type')) { |
|
| 754 | 754 | // Rename type to stats_type |
| 755 | 755 | $query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);"; |
| 756 | 756 | try { |
| 757 | 757 | $sth = $Connection->db->prepare($query); |
| 758 | 758 | $sth->execute(); |
| 759 | - } catch(PDOException $e) { |
|
| 759 | + } catch (PDOException $e) { |
|
| 760 | 760 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 761 | } |
| 762 | 762 | if ($error != '') return $error; |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | try { |
| 766 | 766 | $sth = $Connection->db->prepare($query); |
| 767 | 767 | $sth->execute(); |
| 768 | - } catch(PDOException $e) { |
|
| 768 | + } catch (PDOException $e) { |
|
| 769 | 769 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 770 | 770 | } |
| 771 | 771 | return $error; |
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | try { |
| 789 | 789 | $sth = $Connection->db->prepare($query); |
| 790 | 790 | $sth->execute(); |
| 791 | - } catch(PDOException $e) { |
|
| 791 | + } catch (PDOException $e) { |
|
| 792 | 792 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 793 | 793 | } |
| 794 | 794 | return $error; |
@@ -815,17 +815,17 @@ discard block |
||
| 815 | 815 | try { |
| 816 | 816 | $sth = $Connection->db->prepare($query); |
| 817 | 817 | $sth->execute(); |
| 818 | - } catch(PDOException $e) { |
|
| 818 | + } catch (PDOException $e) { |
|
| 819 | 819 | return "error (create index on spotter_archive) : ".$e->getMessage()."\n"; |
| 820 | 820 | } |
| 821 | 821 | } |
| 822 | - if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
|
| 822 | + if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) { |
|
| 823 | 823 | // Add aircraft_manufacturer to stats_aircraft |
| 824 | 824 | $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
| 825 | 825 | try { |
| 826 | 826 | $sth = $Connection->db->prepare($query); |
| 827 | 827 | $sth->execute(); |
| 828 | - } catch(PDOException $e) { |
|
| 828 | + } catch (PDOException $e) { |
|
| 829 | 829 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 830 | 830 | } |
| 831 | 831 | } |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | try { |
| 835 | 835 | $sth = $Connection->db->prepare($query); |
| 836 | 836 | $sth->execute(); |
| 837 | - } catch(PDOException $e) { |
|
| 837 | + } catch (PDOException $e) { |
|
| 838 | 838 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 839 | 839 | } |
| 840 | 840 | return $error; |
@@ -850,23 +850,23 @@ discard block |
||
| 850 | 850 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 851 | 851 | } |
| 852 | 852 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 853 | - if (!$Connection->checkColumnName('airlines','forsource')) { |
|
| 853 | + if (!$Connection->checkColumnName('airlines', 'forsource')) { |
|
| 854 | 854 | // Add forsource to airlines |
| 855 | 855 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
| 856 | 856 | try { |
| 857 | 857 | $sth = $Connection->db->prepare($query); |
| 858 | 858 | $sth->execute(); |
| 859 | - } catch(PDOException $e) { |
|
| 859 | + } catch (PDOException $e) { |
|
| 860 | 860 | return "error (add forsource column) : ".$e->getMessage()."\n"; |
| 861 | 861 | } |
| 862 | 862 | } |
| 863 | - if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) { |
|
| 863 | + if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) { |
|
| 864 | 864 | // Add forsource to airlines |
| 865 | 865 | $query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 866 | 866 | try { |
| 867 | 867 | $sth = $Connection->db->prepare($query); |
| 868 | 868 | $sth->execute(); |
| 869 | - } catch(PDOException $e) { |
|
| 869 | + } catch (PDOException $e) { |
|
| 870 | 870 | return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n"; |
| 871 | 871 | } |
| 872 | 872 | // Add unique key |
@@ -878,17 +878,17 @@ discard block |
||
| 878 | 878 | try { |
| 879 | 879 | $sth = $Connection->db->prepare($query); |
| 880 | 880 | $sth->execute(); |
| 881 | - } catch(PDOException $e) { |
|
| 881 | + } catch (PDOException $e) { |
|
| 882 | 882 | return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n"; |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | - if (!$Connection->checkColumnName('stats_airport','stats_airline')) { |
|
| 885 | + if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) { |
|
| 886 | 886 | // Add forsource to airlines |
| 887 | 887 | $query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 888 | 888 | try { |
| 889 | 889 | $sth = $Connection->db->prepare($query); |
| 890 | 890 | $sth->execute(); |
| 891 | - } catch(PDOException $e) { |
|
| 891 | + } catch (PDOException $e) { |
|
| 892 | 892 | return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n"; |
| 893 | 893 | } |
| 894 | 894 | // Add unique key |
@@ -900,17 +900,17 @@ discard block |
||
| 900 | 900 | try { |
| 901 | 901 | $sth = $Connection->db->prepare($query); |
| 902 | 902 | $sth->execute(); |
| 903 | - } catch(PDOException $e) { |
|
| 903 | + } catch (PDOException $e) { |
|
| 904 | 904 | return "error (add unique key in stats_airport) : ".$e->getMessage()."\n"; |
| 905 | 905 | } |
| 906 | 906 | } |
| 907 | - if (!$Connection->checkColumnName('stats_country','stats_airline')) { |
|
| 907 | + if (!$Connection->checkColumnName('stats_country', 'stats_airline')) { |
|
| 908 | 908 | // Add forsource to airlines |
| 909 | 909 | $query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 910 | 910 | try { |
| 911 | 911 | $sth = $Connection->db->prepare($query); |
| 912 | 912 | $sth->execute(); |
| 913 | - } catch(PDOException $e) { |
|
| 913 | + } catch (PDOException $e) { |
|
| 914 | 914 | return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n"; |
| 915 | 915 | } |
| 916 | 916 | // Add unique key |
@@ -922,36 +922,36 @@ discard block |
||
| 922 | 922 | try { |
| 923 | 923 | $sth = $Connection->db->prepare($query); |
| 924 | 924 | $sth->execute(); |
| 925 | - } catch(PDOException $e) { |
|
| 925 | + } catch (PDOException $e) { |
|
| 926 | 926 | return "error (add unique key in stats_airline) : ".$e->getMessage()."\n"; |
| 927 | 927 | } |
| 928 | 928 | } |
| 929 | - if (!$Connection->checkColumnName('stats_flight','stats_airline')) { |
|
| 929 | + if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) { |
|
| 930 | 930 | // Add forsource to airlines |
| 931 | 931 | $query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 932 | 932 | try { |
| 933 | 933 | $sth = $Connection->db->prepare($query); |
| 934 | 934 | $sth->execute(); |
| 935 | - } catch(PDOException $e) { |
|
| 935 | + } catch (PDOException $e) { |
|
| 936 | 936 | return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n"; |
| 937 | 937 | } |
| 938 | 938 | } |
| 939 | - if (!$Connection->checkColumnName('stats','stats_airline')) { |
|
| 939 | + if (!$Connection->checkColumnName('stats', 'stats_airline')) { |
|
| 940 | 940 | // Add forsource to airlines |
| 941 | 941 | $query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 942 | 942 | try { |
| 943 | 943 | $sth = $Connection->db->prepare($query); |
| 944 | 944 | $sth->execute(); |
| 945 | - } catch(PDOException $e) { |
|
| 945 | + } catch (PDOException $e) { |
|
| 946 | 946 | return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n"; |
| 947 | 947 | } |
| 948 | - if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) { |
|
| 948 | + if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) { |
|
| 949 | 949 | // Add unique key |
| 950 | 950 | $query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);"; |
| 951 | 951 | try { |
| 952 | 952 | $sth = $Connection->db->prepare($query); |
| 953 | 953 | $sth->execute(); |
| 954 | - } catch(PDOException $e) { |
|
| 954 | + } catch (PDOException $e) { |
|
| 955 | 955 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 956 | 956 | } |
| 957 | 957 | } else { |
@@ -964,18 +964,18 @@ discard block |
||
| 964 | 964 | try { |
| 965 | 965 | $sth = $Connection->db->prepare($query); |
| 966 | 966 | $sth->execute(); |
| 967 | - } catch(PDOException $e) { |
|
| 967 | + } catch (PDOException $e) { |
|
| 968 | 968 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 969 | 969 | } |
| 970 | 970 | } |
| 971 | 971 | } |
| 972 | - if (!$Connection->checkColumnName('stats_registration','stats_airline')) { |
|
| 972 | + if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) { |
|
| 973 | 973 | // Add forsource to airlines |
| 974 | 974 | $query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 975 | 975 | try { |
| 976 | 976 | $sth = $Connection->db->prepare($query); |
| 977 | 977 | $sth->execute(); |
| 978 | - } catch(PDOException $e) { |
|
| 978 | + } catch (PDOException $e) { |
|
| 979 | 979 | return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n"; |
| 980 | 980 | } |
| 981 | 981 | // Add unique key |
@@ -987,17 +987,17 @@ discard block |
||
| 987 | 987 | try { |
| 988 | 988 | $sth = $Connection->db->prepare($query); |
| 989 | 989 | $sth->execute(); |
| 990 | - } catch(PDOException $e) { |
|
| 990 | + } catch (PDOException $e) { |
|
| 991 | 991 | return "error (add unique key in stats_registration) : ".$e->getMessage()."\n"; |
| 992 | 992 | } |
| 993 | 993 | } |
| 994 | - if (!$Connection->checkColumnName('stats_callsign','filter_name')) { |
|
| 994 | + if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) { |
|
| 995 | 995 | // Add forsource to airlines |
| 996 | 996 | $query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 997 | 997 | try { |
| 998 | 998 | $sth = $Connection->db->prepare($query); |
| 999 | 999 | $sth->execute(); |
| 1000 | - } catch(PDOException $e) { |
|
| 1000 | + } catch (PDOException $e) { |
|
| 1001 | 1001 | return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n"; |
| 1002 | 1002 | } |
| 1003 | 1003 | // Add unique key |
@@ -1009,17 +1009,17 @@ discard block |
||
| 1009 | 1009 | try { |
| 1010 | 1010 | $sth = $Connection->db->prepare($query); |
| 1011 | 1011 | $sth->execute(); |
| 1012 | - } catch(PDOException $e) { |
|
| 1012 | + } catch (PDOException $e) { |
|
| 1013 | 1013 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1014 | 1014 | } |
| 1015 | 1015 | } |
| 1016 | - if (!$Connection->checkColumnName('stats_airline','filter_name')) { |
|
| 1016 | + if (!$Connection->checkColumnName('stats_airline', 'filter_name')) { |
|
| 1017 | 1017 | // Add forsource to airlines |
| 1018 | 1018 | $query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1019 | 1019 | try { |
| 1020 | 1020 | $sth = $Connection->db->prepare($query); |
| 1021 | 1021 | $sth->execute(); |
| 1022 | - } catch(PDOException $e) { |
|
| 1022 | + } catch (PDOException $e) { |
|
| 1023 | 1023 | return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n"; |
| 1024 | 1024 | } |
| 1025 | 1025 | // Add unique key |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | try { |
| 1032 | 1032 | $sth = $Connection->db->prepare($query); |
| 1033 | 1033 | $sth->execute(); |
| 1034 | - } catch(PDOException $e) { |
|
| 1034 | + } catch (PDOException $e) { |
|
| 1035 | 1035 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1036 | 1036 | } |
| 1037 | 1037 | } |
@@ -1040,7 +1040,7 @@ discard block |
||
| 1040 | 1040 | try { |
| 1041 | 1041 | $sth = $Connection->db->prepare($query); |
| 1042 | 1042 | $sth->execute(); |
| 1043 | - } catch(PDOException $e) { |
|
| 1043 | + } catch (PDOException $e) { |
|
| 1044 | 1044 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1045 | 1045 | } |
| 1046 | 1046 | return $error; |
@@ -1050,13 +1050,13 @@ discard block |
||
| 1050 | 1050 | global $globalDBdriver; |
| 1051 | 1051 | $Connection = new Connection(); |
| 1052 | 1052 | $error = ''; |
| 1053 | - if (!$Connection->checkColumnName('stats_owner','stats_airline')) { |
|
| 1053 | + if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) { |
|
| 1054 | 1054 | // Add forsource to airlines |
| 1055 | 1055 | $query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1056 | 1056 | try { |
| 1057 | 1057 | $sth = $Connection->db->prepare($query); |
| 1058 | 1058 | $sth->execute(); |
| 1059 | - } catch(PDOException $e) { |
|
| 1059 | + } catch (PDOException $e) { |
|
| 1060 | 1060 | return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n"; |
| 1061 | 1061 | } |
| 1062 | 1062 | // Add unique key |
@@ -1068,17 +1068,17 @@ discard block |
||
| 1068 | 1068 | try { |
| 1069 | 1069 | $sth = $Connection->db->prepare($query); |
| 1070 | 1070 | $sth->execute(); |
| 1071 | - } catch(PDOException $e) { |
|
| 1071 | + } catch (PDOException $e) { |
|
| 1072 | 1072 | return "error (add unique key in stats_owner) : ".$e->getMessage()."\n"; |
| 1073 | 1073 | } |
| 1074 | 1074 | } |
| 1075 | - if (!$Connection->checkColumnName('stats_pilot','stats_airline')) { |
|
| 1075 | + if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) { |
|
| 1076 | 1076 | // Add forsource to airlines |
| 1077 | 1077 | $query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1078 | 1078 | try { |
| 1079 | 1079 | $sth = $Connection->db->prepare($query); |
| 1080 | 1080 | $sth->execute(); |
| 1081 | - } catch(PDOException $e) { |
|
| 1081 | + } catch (PDOException $e) { |
|
| 1082 | 1082 | return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1083 | 1083 | } |
| 1084 | 1084 | // Add unique key |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | try { |
| 1091 | 1091 | $sth = $Connection->db->prepare($query); |
| 1092 | 1092 | $sth->execute(); |
| 1093 | - } catch(PDOException $e) { |
|
| 1093 | + } catch (PDOException $e) { |
|
| 1094 | 1094 | return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1095 | 1095 | } |
| 1096 | 1096 | } |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | try { |
| 1099 | 1099 | $sth = $Connection->db->prepare($query); |
| 1100 | 1100 | $sth->execute(); |
| 1101 | - } catch(PDOException $e) { |
|
| 1101 | + } catch (PDOException $e) { |
|
| 1102 | 1102 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1103 | 1103 | } |
| 1104 | 1104 | return $error; |
@@ -1108,12 +1108,12 @@ discard block |
||
| 1108 | 1108 | global $globalDBdriver; |
| 1109 | 1109 | $Connection = new Connection(); |
| 1110 | 1110 | $error = ''; |
| 1111 | - if (!$Connection->checkColumnName('atc','format_source')) { |
|
| 1111 | + if (!$Connection->checkColumnName('atc', 'format_source')) { |
|
| 1112 | 1112 | $query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL"; |
| 1113 | 1113 | try { |
| 1114 | 1114 | $sth = $Connection->db->prepare($query); |
| 1115 | 1115 | $sth->execute(); |
| 1116 | - } catch(PDOException $e) { |
|
| 1116 | + } catch (PDOException $e) { |
|
| 1117 | 1117 | return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n"; |
| 1118 | 1118 | } |
| 1119 | 1119 | } |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | try { |
| 1122 | 1122 | $sth = $Connection->db->prepare($query); |
| 1123 | 1123 | $sth->execute(); |
| 1124 | - } catch(PDOException $e) { |
|
| 1124 | + } catch (PDOException $e) { |
|
| 1125 | 1125 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1126 | 1126 | } |
| 1127 | 1127 | return $error; |
@@ -1131,13 +1131,13 @@ discard block |
||
| 1131 | 1131 | global $globalDBdriver; |
| 1132 | 1132 | $Connection = new Connection(); |
| 1133 | 1133 | $error = ''; |
| 1134 | - if (!$Connection->checkColumnName('stats_pilot','format_source')) { |
|
| 1134 | + if (!$Connection->checkColumnName('stats_pilot', 'format_source')) { |
|
| 1135 | 1135 | // Add forsource to airlines |
| 1136 | 1136 | $query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''"; |
| 1137 | 1137 | try { |
| 1138 | 1138 | $sth = $Connection->db->prepare($query); |
| 1139 | 1139 | $sth->execute(); |
| 1140 | - } catch(PDOException $e) { |
|
| 1140 | + } catch (PDOException $e) { |
|
| 1141 | 1141 | return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1142 | 1142 | } |
| 1143 | 1143 | // Add unique key |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | try { |
| 1150 | 1150 | $sth = $Connection->db->prepare($query); |
| 1151 | 1151 | $sth->execute(); |
| 1152 | - } catch(PDOException $e) { |
|
| 1152 | + } catch (PDOException $e) { |
|
| 1153 | 1153 | return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1154 | 1154 | } |
| 1155 | 1155 | } |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | try { |
| 1158 | 1158 | $sth = $Connection->db->prepare($query); |
| 1159 | 1159 | $sth->execute(); |
| 1160 | - } catch(PDOException $e) { |
|
| 1160 | + } catch (PDOException $e) { |
|
| 1161 | 1161 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1162 | 1162 | } |
| 1163 | 1163 | return $error; |
@@ -1167,23 +1167,23 @@ discard block |
||
| 1167 | 1167 | global $globalDBdriver; |
| 1168 | 1168 | $Connection = new Connection(); |
| 1169 | 1169 | $error = ''; |
| 1170 | - if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) { |
|
| 1170 | + if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) { |
|
| 1171 | 1171 | // Add unique key |
| 1172 | 1172 | $query = "alter table spotter_live add index(latitude,longitude)"; |
| 1173 | 1173 | try { |
| 1174 | 1174 | $sth = $Connection->db->prepare($query); |
| 1175 | 1175 | $sth->execute(); |
| 1176 | - } catch(PDOException $e) { |
|
| 1176 | + } catch (PDOException $e) { |
|
| 1177 | 1177 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1178 | 1178 | } |
| 1179 | 1179 | } |
| 1180 | - if (!$Connection->checkColumnName('aircraft','mfr')) { |
|
| 1180 | + if (!$Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1181 | 1181 | // Add mfr to aircraft |
| 1182 | 1182 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
| 1183 | 1183 | try { |
| 1184 | 1184 | $sth = $Connection->db->prepare($query); |
| 1185 | 1185 | $sth->execute(); |
| 1186 | - } catch(PDOException $e) { |
|
| 1186 | + } catch (PDOException $e) { |
|
| 1187 | 1187 | return "error (add mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1188 | 1188 | } |
| 1189 | 1189 | } |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | try { |
| 1200 | 1200 | $sth = $Connection->db->prepare($query); |
| 1201 | 1201 | $sth->execute(); |
| 1202 | - } catch(PDOException $e) { |
|
| 1202 | + } catch (PDOException $e) { |
|
| 1203 | 1203 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1204 | 1204 | } |
| 1205 | 1205 | return $error; |
@@ -1209,13 +1209,13 @@ discard block |
||
| 1209 | 1209 | global $globalDBdriver; |
| 1210 | 1210 | $Connection = new Connection(); |
| 1211 | 1211 | $error = ''; |
| 1212 | - if ($Connection->checkColumnName('aircraft','mfr')) { |
|
| 1212 | + if ($Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1213 | 1213 | // drop mfr to aircraft |
| 1214 | 1214 | $query = "ALTER TABLE aircraft DROP COLUMN mfr"; |
| 1215 | 1215 | try { |
| 1216 | 1216 | $sth = $Connection->db->prepare($query); |
| 1217 | 1217 | $sth->execute(); |
| 1218 | - } catch(PDOException $e) { |
|
| 1218 | + } catch (PDOException $e) { |
|
| 1219 | 1219 | return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1220 | 1220 | } |
| 1221 | 1221 | } |
@@ -1231,7 +1231,7 @@ discard block |
||
| 1231 | 1231 | try { |
| 1232 | 1232 | $sth = $Connection->db->prepare($query); |
| 1233 | 1233 | $sth->execute(); |
| 1234 | - } catch(PDOException $e) { |
|
| 1234 | + } catch (PDOException $e) { |
|
| 1235 | 1235 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1236 | 1236 | } |
| 1237 | 1237 | return $error; |
@@ -1241,33 +1241,33 @@ discard block |
||
| 1241 | 1241 | global $globalDBdriver; |
| 1242 | 1242 | $Connection = new Connection(); |
| 1243 | 1243 | $error = ''; |
| 1244 | - if (!$Connection->indexExists('notam','ref_idx')) { |
|
| 1244 | + if (!$Connection->indexExists('notam', 'ref_idx')) { |
|
| 1245 | 1245 | // Add index key |
| 1246 | 1246 | $query = "create index ref_idx on notam (ref)"; |
| 1247 | 1247 | try { |
| 1248 | 1248 | $sth = $Connection->db->prepare($query); |
| 1249 | 1249 | $sth->execute(); |
| 1250 | - } catch(PDOException $e) { |
|
| 1250 | + } catch (PDOException $e) { |
|
| 1251 | 1251 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1252 | 1252 | } |
| 1253 | 1253 | } |
| 1254 | - if (!$Connection->indexExists('accidents','registration_idx')) { |
|
| 1254 | + if (!$Connection->indexExists('accidents', 'registration_idx')) { |
|
| 1255 | 1255 | // Add index key |
| 1256 | 1256 | $query = "create index registration_idx on accidents (registration)"; |
| 1257 | 1257 | try { |
| 1258 | 1258 | $sth = $Connection->db->prepare($query); |
| 1259 | 1259 | $sth->execute(); |
| 1260 | - } catch(PDOException $e) { |
|
| 1260 | + } catch (PDOException $e) { |
|
| 1261 | 1261 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1262 | 1262 | } |
| 1263 | 1263 | } |
| 1264 | - if (!$Connection->indexExists('accidents','rdts')) { |
|
| 1264 | + if (!$Connection->indexExists('accidents', 'rdts')) { |
|
| 1265 | 1265 | // Add index key |
| 1266 | 1266 | $query = "create index rdts on accidents (registration,date,type,source)"; |
| 1267 | 1267 | try { |
| 1268 | 1268 | $sth = $Connection->db->prepare($query); |
| 1269 | 1269 | $sth->execute(); |
| 1270 | - } catch(PDOException $e) { |
|
| 1270 | + } catch (PDOException $e) { |
|
| 1271 | 1271 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1272 | 1272 | } |
| 1273 | 1273 | } |
@@ -1276,7 +1276,7 @@ discard block |
||
| 1276 | 1276 | try { |
| 1277 | 1277 | $sth = $Connection->db->prepare($query); |
| 1278 | 1278 | $sth->execute(); |
| 1279 | - } catch(PDOException $e) { |
|
| 1279 | + } catch (PDOException $e) { |
|
| 1280 | 1280 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1281 | 1281 | } |
| 1282 | 1282 | return $error; |
@@ -1286,23 +1286,23 @@ discard block |
||
| 1286 | 1286 | global $globalDBdriver; |
| 1287 | 1287 | $Connection = new Connection(); |
| 1288 | 1288 | $error = ''; |
| 1289 | - if (!$Connection->checkColumnName('accidents','airline_name')) { |
|
| 1289 | + if (!$Connection->checkColumnName('accidents', 'airline_name')) { |
|
| 1290 | 1290 | // Add airline_name to accidents |
| 1291 | 1291 | $query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL"; |
| 1292 | 1292 | try { |
| 1293 | 1293 | $sth = $Connection->db->prepare($query); |
| 1294 | 1294 | $sth->execute(); |
| 1295 | - } catch(PDOException $e) { |
|
| 1295 | + } catch (PDOException $e) { |
|
| 1296 | 1296 | return "error (add airline_name column in accidents) : ".$e->getMessage()."\n"; |
| 1297 | 1297 | } |
| 1298 | 1298 | } |
| 1299 | - if (!$Connection->checkColumnName('accidents','airline_icao')) { |
|
| 1299 | + if (!$Connection->checkColumnName('accidents', 'airline_icao')) { |
|
| 1300 | 1300 | // Add airline_icao to accidents |
| 1301 | 1301 | $query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL"; |
| 1302 | 1302 | try { |
| 1303 | 1303 | $sth = $Connection->db->prepare($query); |
| 1304 | 1304 | $sth->execute(); |
| 1305 | - } catch(PDOException $e) { |
|
| 1305 | + } catch (PDOException $e) { |
|
| 1306 | 1306 | return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n"; |
| 1307 | 1307 | } |
| 1308 | 1308 | } |
@@ -1310,7 +1310,7 @@ discard block |
||
| 1310 | 1310 | try { |
| 1311 | 1311 | $sth = $Connection->db->prepare($query); |
| 1312 | 1312 | $sth->execute(); |
| 1313 | - } catch(PDOException $e) { |
|
| 1313 | + } catch (PDOException $e) { |
|
| 1314 | 1314 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1315 | 1315 | } |
| 1316 | 1316 | return $error; |
@@ -1320,13 +1320,13 @@ discard block |
||
| 1320 | 1320 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1321 | 1321 | $Connection = new Connection(); |
| 1322 | 1322 | $error = ''; |
| 1323 | - if (!$Connection->checkColumnName('airlines','alliance')) { |
|
| 1323 | + if (!$Connection->checkColumnName('airlines', 'alliance')) { |
|
| 1324 | 1324 | // Add alliance to airlines |
| 1325 | 1325 | $query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL"; |
| 1326 | 1326 | try { |
| 1327 | 1327 | $sth = $Connection->db->prepare($query); |
| 1328 | 1328 | $sth->execute(); |
| 1329 | - } catch(PDOException $e) { |
|
| 1329 | + } catch (PDOException $e) { |
|
| 1330 | 1330 | return "error (add alliance column in airlines) : ".$e->getMessage()."\n"; |
| 1331 | 1331 | } |
| 1332 | 1332 | } |
@@ -1353,7 +1353,7 @@ discard block |
||
| 1353 | 1353 | try { |
| 1354 | 1354 | $sth = $Connection->db->prepare($query); |
| 1355 | 1355 | $sth->execute(); |
| 1356 | - } catch(PDOException $e) { |
|
| 1356 | + } catch (PDOException $e) { |
|
| 1357 | 1357 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1358 | 1358 | } |
| 1359 | 1359 | return $error; |
@@ -1363,13 +1363,13 @@ discard block |
||
| 1363 | 1363 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1364 | 1364 | $Connection = new Connection(); |
| 1365 | 1365 | $error = ''; |
| 1366 | - if (!$Connection->checkColumnName('airlines','ban_eu')) { |
|
| 1366 | + if (!$Connection->checkColumnName('airlines', 'ban_eu')) { |
|
| 1367 | 1367 | // Add ban_eu to airlines |
| 1368 | 1368 | $query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'"; |
| 1369 | 1369 | try { |
| 1370 | 1370 | $sth = $Connection->db->prepare($query); |
| 1371 | 1371 | $sth->execute(); |
| 1372 | - } catch(PDOException $e) { |
|
| 1372 | + } catch (PDOException $e) { |
|
| 1373 | 1373 | return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n"; |
| 1374 | 1374 | } |
| 1375 | 1375 | } |
@@ -1377,7 +1377,7 @@ discard block |
||
| 1377 | 1377 | try { |
| 1378 | 1378 | $sth = $Connection->db->prepare($query); |
| 1379 | 1379 | $sth->execute(); |
| 1380 | - } catch(PDOException $e) { |
|
| 1380 | + } catch (PDOException $e) { |
|
| 1381 | 1381 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1382 | 1382 | } |
| 1383 | 1383 | return $error; |
@@ -1388,19 +1388,19 @@ discard block |
||
| 1388 | 1388 | $Connection = new Connection(); |
| 1389 | 1389 | $error = ''; |
| 1390 | 1390 | if ($globalDBdriver == 'mysql') { |
| 1391 | - if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') { |
|
| 1391 | + if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') { |
|
| 1392 | 1392 | $query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL"; |
| 1393 | 1393 | try { |
| 1394 | 1394 | $sth = $Connection->db->prepare($query); |
| 1395 | 1395 | $sth->execute(); |
| 1396 | - } catch(PDOException $e) { |
|
| 1396 | + } catch (PDOException $e) { |
|
| 1397 | 1397 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1398 | 1398 | } |
| 1399 | 1399 | $query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()"; |
| 1400 | 1400 | try { |
| 1401 | 1401 | $sth = $Connection->db->prepare($query); |
| 1402 | 1402 | $sth->execute(); |
| 1403 | - } catch(PDOException $e) { |
|
| 1403 | + } catch (PDOException $e) { |
|
| 1404 | 1404 | return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n"; |
| 1405 | 1405 | } |
| 1406 | 1406 | |
@@ -1408,7 +1408,7 @@ discard block |
||
| 1408 | 1408 | try { |
| 1409 | 1409 | $sth = $Connection->db->prepare($query); |
| 1410 | 1410 | $sth->execute(); |
| 1411 | - } catch(PDOException $e) { |
|
| 1411 | + } catch (PDOException $e) { |
|
| 1412 | 1412 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1413 | 1413 | } |
| 1414 | 1414 | /*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150"; |
@@ -1459,7 +1459,7 @@ discard block |
||
| 1459 | 1459 | try { |
| 1460 | 1460 | $sth = $Connection->db->prepare($query); |
| 1461 | 1461 | $sth->execute(); |
| 1462 | - } catch(PDOException $e) { |
|
| 1462 | + } catch (PDOException $e) { |
|
| 1463 | 1463 | return "error (fix date) : ".$e->getMessage()."\n"; |
| 1464 | 1464 | } |
| 1465 | 1465 | } |
@@ -1544,7 +1544,7 @@ discard block |
||
| 1544 | 1544 | try { |
| 1545 | 1545 | $sth = $Connection->db->prepare($query); |
| 1546 | 1546 | $sth->execute(); |
| 1547 | - } catch(PDOException $e) { |
|
| 1547 | + } catch (PDOException $e) { |
|
| 1548 | 1548 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1549 | 1549 | } |
| 1550 | 1550 | return $error; |
@@ -1553,13 +1553,13 @@ discard block |
||
| 1553 | 1553 | global $globalDBdriver; |
| 1554 | 1554 | $Connection = new Connection(); |
| 1555 | 1555 | $error = ''; |
| 1556 | - if (!$Connection->indexExists('accidents','type')) { |
|
| 1556 | + if (!$Connection->indexExists('accidents', 'type')) { |
|
| 1557 | 1557 | // Add index key |
| 1558 | 1558 | $query = "create index type on accidents (type,date)"; |
| 1559 | 1559 | try { |
| 1560 | 1560 | $sth = $Connection->db->prepare($query); |
| 1561 | 1561 | $sth->execute(); |
| 1562 | - } catch(PDOException $e) { |
|
| 1562 | + } catch (PDOException $e) { |
|
| 1563 | 1563 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1564 | 1564 | } |
| 1565 | 1565 | } |
@@ -1567,7 +1567,7 @@ discard block |
||
| 1567 | 1567 | try { |
| 1568 | 1568 | $sth = $Connection->db->prepare($query); |
| 1569 | 1569 | $sth->execute(); |
| 1570 | - } catch(PDOException $e) { |
|
| 1570 | + } catch (PDOException $e) { |
|
| 1571 | 1571 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1572 | 1572 | } |
| 1573 | 1573 | return $error; |
@@ -1577,12 +1577,12 @@ discard block |
||
| 1577 | 1577 | global $globalDBdriver; |
| 1578 | 1578 | $Connection = new Connection(); |
| 1579 | 1579 | $error = ''; |
| 1580 | - if (!$Connection->checkColumnName('aircraft_modes','source_type')) { |
|
| 1580 | + if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) { |
|
| 1581 | 1581 | $query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'"; |
| 1582 | 1582 | try { |
| 1583 | 1583 | $sth = $Connection->db->prepare($query); |
| 1584 | 1584 | $sth->execute(); |
| 1585 | - } catch(PDOException $e) { |
|
| 1585 | + } catch (PDOException $e) { |
|
| 1586 | 1586 | return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n"; |
| 1587 | 1587 | } |
| 1588 | 1588 | } |
@@ -1636,7 +1636,7 @@ discard block |
||
| 1636 | 1636 | try { |
| 1637 | 1637 | $sth = $Connection->db->prepare($query); |
| 1638 | 1638 | $sth->execute(); |
| 1639 | - } catch(PDOException $e) { |
|
| 1639 | + } catch (PDOException $e) { |
|
| 1640 | 1640 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1641 | 1641 | } |
| 1642 | 1642 | return $error; |
@@ -1658,7 +1658,7 @@ discard block |
||
| 1658 | 1658 | try { |
| 1659 | 1659 | $sth = $Connection->db->prepare($query); |
| 1660 | 1660 | $sth->execute(); |
| 1661 | - } catch(PDOException $e) { |
|
| 1661 | + } catch (PDOException $e) { |
|
| 1662 | 1662 | return "error : ".$e->getMessage()."\n"; |
| 1663 | 1663 | } |
| 1664 | 1664 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -29,31 +29,31 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | private function make_latf($temp) { // unsigned long |
| 31 | 31 | $flat = 0.0; // float |
| 32 | - $temp = $temp & 0x07FFFFFF; |
|
| 33 | - if ($temp & 0x04000000) { |
|
| 34 | - $temp = $temp ^ 0x07FFFFFF; |
|
| 32 | + $temp = $temp&0x07FFFFFF; |
|
| 33 | + if ($temp&0x04000000) { |
|
| 34 | + $temp = $temp^0x07FFFFFF; |
|
| 35 | 35 | $temp += 1; |
| 36 | - $flat = (float)($temp / (60.0 * 10000.0)); |
|
| 36 | + $flat = (float) ($temp/(60.0*10000.0)); |
|
| 37 | 37 | $flat *= -1.0; |
| 38 | - } else $flat = (float)($temp / (60.0 * 10000.0)); |
|
| 38 | + } else $flat = (float) ($temp/(60.0*10000.0)); |
|
| 39 | 39 | return $flat; // float |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | private function make_lonf($temp) { // unsigned long |
| 43 | 43 | $flon = 0.0; // float |
| 44 | - $temp = $temp & 0x0FFFFFFF; |
|
| 45 | - if ($temp & 0x08000000) { |
|
| 46 | - $temp = $temp ^ 0x0FFFFFFF; |
|
| 44 | + $temp = $temp&0x0FFFFFFF; |
|
| 45 | + if ($temp&0x08000000) { |
|
| 46 | + $temp = $temp^0x0FFFFFFF; |
|
| 47 | 47 | $temp += 1; |
| 48 | - $flon = (float)($temp / (60.0 * 10000.0)); |
|
| 48 | + $flon = (float) ($temp/(60.0*10000.0)); |
|
| 49 | 49 | $flon *= -1.0; |
| 50 | - } else $flon = (float)($temp / (60.0 * 10000.0)); |
|
| 50 | + } else $flon = (float) ($temp/(60.0*10000.0)); |
|
| 51 | 51 | return $flon; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | private function ascii_2_dec($chr) { |
| 55 | - $dec=ord($chr);//get decimal ascii code |
|
| 56 | - $hex=dechex($dec);//convert decimal to hex |
|
| 55 | + $dec = ord($chr); //get decimal ascii code |
|
| 56 | + $hex = dechex($dec); //convert decimal to hex |
|
| 57 | 57 | return ($dec); |
| 58 | 58 | } |
| 59 | 59 | |
@@ -72,15 +72,15 @@ discard block |
||
| 72 | 72 | //only process in the following range: 48-87, 96-119 |
| 73 | 73 | if ($ascii < 48) { } |
| 74 | 74 | else { |
| 75 | - if($ascii>119) { } |
|
| 75 | + if ($ascii > 119) { } |
|
| 76 | 76 | else { |
| 77 | - if ($ascii>87 && $ascii<96) ; |
|
| 77 | + if ($ascii > 87 && $ascii < 96); |
|
| 78 | 78 | else { |
| 79 | - $ascii=$ascii+40; |
|
| 80 | - if ($ascii>128){ |
|
| 81 | - $ascii=$ascii+32; |
|
| 79 | + $ascii = $ascii + 40; |
|
| 80 | + if ($ascii > 128) { |
|
| 81 | + $ascii = $ascii + 32; |
|
| 82 | 82 | } else { |
| 83 | - $ascii=$ascii+40; |
|
| 83 | + $ascii = $ascii + 40; |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | private function dec_2_6bit($dec) { |
| 92 | - $bin=decbin($dec); |
|
| 92 | + $bin = decbin($dec); |
|
| 93 | 93 | return(substr($bin, -6)); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -107,11 +107,11 @@ discard block |
||
| 107 | 107 | ); |
| 108 | 108 | // " |
| 109 | 109 | $rv = ''; |
| 110 | - if ($_size % 6 == 0) { |
|
| 111 | - $len = $_size / 6; |
|
| 112 | - for ($i=0; $i<$len; $i++) { |
|
| 113 | - $offset = $i * 6; |
|
| 114 | - $rv .= $ais_chars[ bindec(substr($_str,$_start + $offset,6)) ]; |
|
| 110 | + if ($_size%6 == 0) { |
|
| 111 | + $len = $_size/6; |
|
| 112 | + for ($i = 0; $i < $len; $i++) { |
|
| 113 | + $offset = $i*6; |
|
| 114 | + $rv .= $ais_chars[bindec(substr($_str, $_start + $offset, 6))]; |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | return $rv; |
@@ -138,93 +138,93 @@ discard block |
||
| 138 | 138 | $ro->eta_hour = ''; |
| 139 | 139 | $ro->eta_minute = ''; |
| 140 | 140 | $ro->ts = time(); |
| 141 | - $ro->id = bindec(substr($_aisdata,0,6)); |
|
| 142 | - $ro->mmsi = bindec(substr($_aisdata,8,30)); |
|
| 141 | + $ro->id = bindec(substr($_aisdata, 0, 6)); |
|
| 142 | + $ro->mmsi = bindec(substr($_aisdata, 8, 30)); |
|
| 143 | 143 | if ($ro->id >= 1 && $ro->id <= 3) { |
| 144 | - $ro->cog = bindec(substr($_aisdata,116,12))/10; |
|
| 145 | - $ro->sog = bindec(substr($_aisdata,50,10))/10; |
|
| 146 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28))); |
|
| 147 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27))); |
|
| 144 | + $ro->cog = bindec(substr($_aisdata, 116, 12))/10; |
|
| 145 | + $ro->sog = bindec(substr($_aisdata, 50, 10))/10; |
|
| 146 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28))); |
|
| 147 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27))); |
|
| 148 | 148 | $ro->cls = 1; // class A |
| 149 | 149 | } else if ($ro->id == 4) { |
| 150 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,79,28))); |
|
| 151 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,107,27))); |
|
| 150 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 79, 28))); |
|
| 151 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 107, 27))); |
|
| 152 | 152 | $ro->cls = 1; // class A |
| 153 | 153 | } else if ($ro->id == 5) { |
| 154 | - $ro->imo = bindec(substr($_aisdata,40,30)); |
|
| 155 | - $ro->callsign = $this->binchar($_aisdata,70,42); |
|
| 156 | - $ro->name = $this->binchar($_aisdata,112,120); |
|
| 157 | - $ro->typeid = bindec(substr($_aisdata,232,8)); |
|
| 154 | + $ro->imo = bindec(substr($_aisdata, 40, 30)); |
|
| 155 | + $ro->callsign = $this->binchar($_aisdata, 70, 42); |
|
| 156 | + $ro->name = $this->binchar($_aisdata, 112, 120); |
|
| 157 | + $ro->typeid = bindec(substr($_aisdata, 232, 8)); |
|
| 158 | 158 | $ro->type = $this->getShipType($ro->typeid); |
| 159 | 159 | //$ro->to_bow = bindec(substr($_aisdata,240,9)); |
| 160 | 160 | //$ro->to_stern = bindec(substr($_aisdata,249,9)); |
| 161 | 161 | //$ro->to_port = bindec(substr($_aisdata,258,6)); |
| 162 | 162 | //$ro->to_starboard = bindec(substr($_aisdata,264,6)); |
| 163 | - $ro->eta_month = bindec(substr($_aisdata,274,4)); |
|
| 164 | - $ro->eta_day = bindec(substr($_aisdata,278,5)); |
|
| 165 | - $ro->eta_hour = bindec(substr($_aisdata,283,5)); |
|
| 166 | - $ro->eta_minute = bindec(substr($_aisdata,288,6)); |
|
| 163 | + $ro->eta_month = bindec(substr($_aisdata, 274, 4)); |
|
| 164 | + $ro->eta_day = bindec(substr($_aisdata, 278, 5)); |
|
| 165 | + $ro->eta_hour = bindec(substr($_aisdata, 283, 5)); |
|
| 166 | + $ro->eta_minute = bindec(substr($_aisdata, 288, 6)); |
|
| 167 | 167 | //$ro->draught = bindec(substr($_aisdata,294,8)); |
| 168 | - $ro->destination = $this->binchar($_aisdata,302,120); |
|
| 168 | + $ro->destination = $this->binchar($_aisdata, 302, 120); |
|
| 169 | 169 | $ro->cls = 1; // class A |
| 170 | 170 | } else if ($ro->id == 9) { |
| 171 | 171 | // Search and Rescue aircraft position report |
| 172 | 172 | } else if ($ro->id == 18) { |
| 173 | - $ro->cog = bindec(substr($_aisdata,112,12))/10; |
|
| 174 | - $ro->sog = bindec(substr($_aisdata,46,10))/10; |
|
| 175 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,57,28))); |
|
| 176 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,85,27))); |
|
| 177 | - $ro->heading = bindec(substr($_aisdata,124,9)); |
|
| 173 | + $ro->cog = bindec(substr($_aisdata, 112, 12))/10; |
|
| 174 | + $ro->sog = bindec(substr($_aisdata, 46, 10))/10; |
|
| 175 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 57, 28))); |
|
| 176 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 85, 27))); |
|
| 177 | + $ro->heading = bindec(substr($_aisdata, 124, 9)); |
|
| 178 | 178 | if ($ro->heading == 511) $ro->heading = ''; |
| 179 | 179 | $ro->cls = 2; // class B |
| 180 | 180 | } else if ($ro->id == 19) { |
| 181 | - $ro->cog = bindec(substr($_aisdata,112,12))/10; |
|
| 182 | - $ro->sog = bindec(substr($_aisdata,46,10))/10; |
|
| 183 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28))); |
|
| 184 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27))); |
|
| 185 | - $ro->name = $this->binchar($_aisdata,143,120); |
|
| 181 | + $ro->cog = bindec(substr($_aisdata, 112, 12))/10; |
|
| 182 | + $ro->sog = bindec(substr($_aisdata, 46, 10))/10; |
|
| 183 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28))); |
|
| 184 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27))); |
|
| 185 | + $ro->name = $this->binchar($_aisdata, 143, 120); |
|
| 186 | 186 | $ro->cls = 2; // class B |
| 187 | - $ro->heading = bindec(substr($_aisdata,124,9)); |
|
| 187 | + $ro->heading = bindec(substr($_aisdata, 124, 9)); |
|
| 188 | 188 | if ($ro->heading == 511) $ro->heading = ''; |
| 189 | - $ro->typeid = bindec(substr($_aisdata,263,8)); |
|
| 189 | + $ro->typeid = bindec(substr($_aisdata, 263, 8)); |
|
| 190 | 190 | $ro->type = $this->getShipType($ro->typeid); |
| 191 | 191 | //$ro->to_bow = bindec(substr($_aisdata,271,9)); |
| 192 | 192 | //$ro->to_stern = bindec(substr($_aisdata,280,9)); |
| 193 | 193 | //$ro->to_port = bindec(substr($_aisdata,289,6)); |
| 194 | 194 | //$ro->to_starboard = bindec(substr($_aisdata,295,6)); |
| 195 | 195 | } else if ($ro->id == 21) { |
| 196 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,164,28))); |
|
| 197 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,192,27))); |
|
| 198 | - $ro->name = $this->binchar($_aisdata,43,120); |
|
| 196 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 164, 28))); |
|
| 197 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 192, 27))); |
|
| 198 | + $ro->name = $this->binchar($_aisdata, 43, 120); |
|
| 199 | 199 | //$ro->to_bow = bindec(substr($_aisdata,219,9)); |
| 200 | 200 | //$ro->to_stern = bindec(substr($_aisdata,228,9)); |
| 201 | 201 | //$ro->to_port = bindec(substr($_aisdata,237,6)); |
| 202 | 202 | //$ro->to_starboard = bindec(substr($_aisdata,243,6)); |
| 203 | 203 | $ro->cls = 2; // class B |
| 204 | 204 | } else if ($ro->id == 24) { |
| 205 | - $pn = bindec(substr($_aisdata,38,2)); |
|
| 205 | + $pn = bindec(substr($_aisdata, 38, 2)); |
|
| 206 | 206 | if ($pn == 0) { |
| 207 | - $ro->name = $this->binchar($_aisdata,40,120); |
|
| 207 | + $ro->name = $this->binchar($_aisdata, 40, 120); |
|
| 208 | 208 | } |
| 209 | - $ro->typeid = bindec(substr($_aisdata,40,8)); |
|
| 209 | + $ro->typeid = bindec(substr($_aisdata, 40, 8)); |
|
| 210 | 210 | $ro->type = $this->getShipType($ro->typeid); |
| 211 | - $ro->callsign = $this->binchar($_aisdata,90,42); |
|
| 211 | + $ro->callsign = $this->binchar($_aisdata, 90, 42); |
|
| 212 | 212 | //$ro->to_bow = bindec(substr($_aisdata,132,9)); |
| 213 | 213 | //$ro->to_stern = bindec(substr($_aisdata,141,9)); |
| 214 | 214 | //$ro->to_port = bindec(substr($_aisdata,150,6)); |
| 215 | 215 | //$ro->to_starboard = bindec(substr($_aisdata,156,6)); |
| 216 | 216 | $ro->cls = 2; // class B |
| 217 | 217 | } else if ($ro->id == 27) { |
| 218 | - $ro->cog = bindec(substr($_aisdata,85,9)); |
|
| 218 | + $ro->cog = bindec(substr($_aisdata, 85, 9)); |
|
| 219 | 219 | if ($ro->cog == 511) $ro->cog = 0.0; |
| 220 | - $ro->sog = bindec(substr($_aisdata,79,6)); |
|
| 220 | + $ro->sog = bindec(substr($_aisdata, 79, 6)); |
|
| 221 | 221 | if ($ro->sog == 63) $ro->sog = 0.0; |
| 222 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,44,18))*10); |
|
| 223 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,62,17))*10); |
|
| 222 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 44, 18))*10); |
|
| 223 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 62, 17))*10); |
|
| 224 | 224 | $ro->cls = 1; // class A |
| 225 | 225 | |
| 226 | 226 | } |
| 227 | - $ro->statusid = bindec(substr($_aisdata,38,4)); |
|
| 227 | + $ro->statusid = bindec(substr($_aisdata, 38, 4)); |
|
| 228 | 228 | $ro->status = $this->getStatus($ro->statusid); |
| 229 | 229 | //var_dump($ro); // dump results here for demo purpose |
| 230 | 230 | return $ro; |
@@ -355,14 +355,14 @@ discard block |
||
| 355 | 355 | global $port; // tcpip port... |
| 356 | 356 | |
| 357 | 357 | static $debug_counter = 0; |
| 358 | - $aisdata168='';//six bit array of ascii characters |
|
| 358 | + $aisdata168 = ''; //six bit array of ascii characters |
|
| 359 | 359 | $ais_nmea_array = str_split($_itu); // convert to an array |
| 360 | 360 | foreach ($ais_nmea_array as $value) { |
| 361 | 361 | $dec = $this->ascii_2_dec($value); |
| 362 | 362 | $bit8 = $this->asciidec_2_8bit($dec); |
| 363 | 363 | $bit6 = $this->dec_2_6bit($bit8); |
| 364 | 364 | //echo $value ."-" .$bit6 .""; |
| 365 | - $aisdata168 .=$bit6; |
|
| 365 | + $aisdata168 .= $bit6; |
|
| 366 | 366 | } |
| 367 | 367 | //echo $aisdata168 . "<br/>"; |
| 368 | 368 | //return $this->decode_ais($aisdata168, $aux); |
@@ -385,20 +385,20 @@ discard block |
||
| 385 | 385 | // calculate checksum after ! till * |
| 386 | 386 | // assume 1st ! is valid |
| 387 | 387 | // find * ensure that it is at correct position |
| 388 | - $end = strrpos ( $rawdata , '*' ); |
|
| 388 | + $end = strrpos($rawdata, '*'); |
|
| 389 | 389 | if ($end === FALSE) return -1; // check for NULLS!!! |
| 390 | - $cs = substr( $rawdata, $end + 1 ); |
|
| 391 | - if ( strlen($cs) != 2 ) return -1; // correct cs length |
|
| 392 | - $dcs = (int)hexdec( $cs ); |
|
| 393 | - for ( $alias=1; $alias<$end; $alias++) $chksum ^= ord( $rawdata[$alias] ); // perform XOR for NMEA checksum |
|
| 394 | - if ( $chksum == $dcs ) { // NMEA checksum pass |
|
| 390 | + $cs = substr($rawdata, $end + 1); |
|
| 391 | + if (strlen($cs) != 2) return -1; // correct cs length |
|
| 392 | + $dcs = (int) hexdec($cs); |
|
| 393 | + for ($alias = 1; $alias < $end; $alias++) $chksum ^= ord($rawdata[$alias]); // perform XOR for NMEA checksum |
|
| 394 | + if ($chksum == $dcs) { // NMEA checksum pass |
|
| 395 | 395 | $pcs = explode(',', $rawdata); |
| 396 | 396 | // !AI??? identifier |
| 397 | - $num_seq = (int)$pcs[1]; // number of sequences |
|
| 398 | - $seq = (int)$pcs[2]; // get sequence |
|
| 397 | + $num_seq = (int) $pcs[1]; // number of sequences |
|
| 398 | + $seq = (int) $pcs[2]; // get sequence |
|
| 399 | 399 | // get msg sequence id |
| 400 | 400 | if ($pcs[3] == '') $msg_sid = -1; // non-multipart message, set to -1 |
| 401 | - else $msg_sid = (int)$pcs[3]; // multipart message |
|
| 401 | + else $msg_sid = (int) $pcs[3]; // multipart message |
|
| 402 | 402 | $ais_ch = $pcs[4]; // get AIS channel |
| 403 | 403 | // message sequence checking |
| 404 | 404 | if ($num_seq < 1 || $num_seq > 9) { |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | } |
| 432 | 432 | } |
| 433 | 433 | $itu = $itu.$pcs[5]; // get itu message |
| 434 | - $filler += (int)$pcs[6][0]; // get filler |
|
| 434 | + $filler += (int) $pcs[6][0]; // get filler |
|
| 435 | 435 | if ($num_seq == 1 // valid single message |
| 436 | 436 | || $num_seq == $pseq // valid multi-part message |
| 437 | 437 | ) { |
@@ -451,13 +451,13 @@ discard block |
||
| 451 | 451 | $cbuf = $cbuf.$ibuf; |
| 452 | 452 | $last_pos = 0; |
| 453 | 453 | $result = new stdClass(); |
| 454 | - while ( ($start = strpos($cbuf,"VDM",$last_pos)) !== FALSE) { |
|
| 454 | + while (($start = strpos($cbuf, "VDM", $last_pos)) !== FALSE) { |
|
| 455 | 455 | //while ( ($start = strpos($cbuf,"!AI",$last_pos)) !== FALSE) { |
| 456 | 456 | //DEBUG echo $cbuf; |
| 457 | - if ( ($end = strpos($cbuf,"\r\n", $start)) !== FALSE) { //TBD need to trim? |
|
| 457 | + if (($end = strpos($cbuf, "\r\n", $start)) !== FALSE) { //TBD need to trim? |
|
| 458 | 458 | $tst = substr($cbuf, $start - 3, ($end - $start + 3)); |
| 459 | 459 | //DEBUG echo "[$start $end $tst]\n"; |
| 460 | - $result = $this->process_ais_raw( $tst, "" ); |
|
| 460 | + $result = $this->process_ais_raw($tst, ""); |
|
| 461 | 461 | $last_pos = $end + 1; |
| 462 | 462 | } else break; |
| 463 | 463 | } |
@@ -469,41 +469,41 @@ discard block |
||
| 469 | 469 | // incoming data from serial or IP comms |
| 470 | 470 | public function process_ais_line($cbuf) { |
| 471 | 471 | $result = new stdClass(); |
| 472 | - $start = strpos($cbuf,"VDM"); |
|
| 472 | + $start = strpos($cbuf, "VDM"); |
|
| 473 | 473 | $tst = substr($cbuf, $start - 3); |
| 474 | - $result = $this->process_ais_raw( $tst, "" ); |
|
| 474 | + $result = $this->process_ais_raw($tst, ""); |
|
| 475 | 475 | return $result; |
| 476 | 476 | } |
| 477 | 477 | |
| 478 | 478 | /* AIS Encoding |
| 479 | 479 | */ |
| 480 | - private function mk_ais_lat( $lat ) { |
|
| 480 | + private function mk_ais_lat($lat) { |
|
| 481 | 481 | //$lat = 1.2569; |
| 482 | - if ($lat<0.0) { |
|
| 482 | + if ($lat < 0.0) { |
|
| 483 | 483 | $lat = -$lat; |
| 484 | - $neg=true; |
|
| 485 | - } else $neg=false; |
|
| 484 | + $neg = true; |
|
| 485 | + } else $neg = false; |
|
| 486 | 486 | $latd = 0x00000000; |
| 487 | - $latd = intval ($lat * 600000.0); |
|
| 488 | - if ($neg==true) { |
|
| 487 | + $latd = intval($lat*600000.0); |
|
| 488 | + if ($neg == true) { |
|
| 489 | 489 | $latd = ~$latd; |
| 490 | - $latd+=1; |
|
| 490 | + $latd += 1; |
|
| 491 | 491 | $latd &= 0x07FFFFFF; |
| 492 | 492 | } |
| 493 | 493 | return $latd; |
| 494 | 494 | } |
| 495 | 495 | |
| 496 | - private function mk_ais_lon( $lon ) { |
|
| 496 | + private function mk_ais_lon($lon) { |
|
| 497 | 497 | //$lon = 103.851; |
| 498 | - if ($lon<0.0) { |
|
| 498 | + if ($lon < 0.0) { |
|
| 499 | 499 | $lon = -$lon; |
| 500 | - $neg=true; |
|
| 501 | - } else $neg=false; |
|
| 500 | + $neg = true; |
|
| 501 | + } else $neg = false; |
|
| 502 | 502 | $lond = 0x00000000; |
| 503 | - $lond = intval ($lon * 600000.0); |
|
| 504 | - if ($neg==true) { |
|
| 503 | + $lond = intval($lon*600000.0); |
|
| 504 | + if ($neg == true) { |
|
| 505 | 505 | $lond = ~$lond; |
| 506 | - $lond+=1; |
|
| 506 | + $lond += 1; |
|
| 507 | 507 | $lond &= 0x0FFFFFFF; |
| 508 | 508 | } |
| 509 | 509 | return $lond; |
@@ -511,8 +511,8 @@ discard block |
||
| 511 | 511 | |
| 512 | 512 | private function char2bin($name, $max_len) { |
| 513 | 513 | $len = strlen($name); |
| 514 | - if ($len > $max_len) $name = substr($name,0,$max_len); |
|
| 515 | - if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len) * 6); |
|
| 514 | + if ($len > $max_len) $name = substr($name, 0, $max_len); |
|
| 515 | + if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len)*6); |
|
| 516 | 516 | else $pad = ''; |
| 517 | 517 | $rv = ''; |
| 518 | 518 | $ais_chars = array( |
@@ -529,26 +529,26 @@ discard block |
||
| 529 | 529 | if ($_a) foreach ($_a as $_1) { |
| 530 | 530 | if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1]; |
| 531 | 531 | else $dec = 0; |
| 532 | - $bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT); |
|
| 532 | + $bin = str_pad(decbin($dec), 6, '0', STR_PAD_LEFT); |
|
| 533 | 533 | $rv .= $bin; |
| 534 | 534 | //echo "$_1 $dec ($bin)<br/>"; |
| 535 | 535 | } |
| 536 | 536 | return $rv.$pad; |
| 537 | 537 | } |
| 538 | 538 | |
| 539 | - private function mk_ais($_enc, $_part=1,$_total=1,$_seq='',$_ch='A') { |
|
| 539 | + private function mk_ais($_enc, $_part = 1, $_total = 1, $_seq = '', $_ch = 'A') { |
|
| 540 | 540 | $len_bit = strlen($_enc); |
| 541 | - $rem6 = $len_bit % 6; |
|
| 541 | + $rem6 = $len_bit%6; |
|
| 542 | 542 | $pad6_len = 0; |
| 543 | 543 | if ($rem6) $pad6_len = 6 - $rem6; |
| 544 | 544 | //echo $pad6_len.'<br>'; |
| 545 | 545 | $_enc .= str_repeat("0", $pad6_len); // pad the text... |
| 546 | - $len_enc = strlen($_enc) / 6; |
|
| 546 | + $len_enc = strlen($_enc)/6; |
|
| 547 | 547 | //echo $_enc.' '.$len_enc.'<br/>'; |
| 548 | 548 | $itu = ''; |
| 549 | - for ($i=0; $i<$len_enc; $i++) { |
|
| 550 | - $offset = $i * 6; |
|
| 551 | - $dec = bindec(substr($_enc,$offset,6)); |
|
| 549 | + for ($i = 0; $i < $len_enc; $i++) { |
|
| 550 | + $offset = $i*6; |
|
| 551 | + $dec = bindec(substr($_enc, $offset, 6)); |
|
| 552 | 552 | if ($dec < 40) $dec += 48; |
| 553 | 553 | else $dec += 56; |
| 554 | 554 | //echo chr($dec)." $dec<br/>"; |
@@ -558,15 +558,15 @@ discard block |
||
| 558 | 558 | $chksum = 0; |
| 559 | 559 | $itu = "AIVDM,$_part,$_total,$_seq,$_ch,".$itu.",0"; |
| 560 | 560 | $len_itu = strlen($itu); |
| 561 | - for ($i=0; $i<$len_itu; $i++) { |
|
| 562 | - $chksum ^= ord( $itu[$i] ); |
|
| 561 | + for ($i = 0; $i < $len_itu; $i++) { |
|
| 562 | + $chksum ^= ord($itu[$i]); |
|
| 563 | 563 | } |
| 564 | - $hex_arr = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); |
|
| 565 | - $lsb = $chksum & 0x0F; |
|
| 566 | - if ($lsb >=0 && $lsb <= 15 ) $lsbc = $hex_arr[$lsb]; |
|
| 564 | + $hex_arr = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); |
|
| 565 | + $lsb = $chksum&0x0F; |
|
| 566 | + if ($lsb >= 0 && $lsb <= 15) $lsbc = $hex_arr[$lsb]; |
|
| 567 | 567 | else $lsbc = '0'; |
| 568 | - $msb = (($chksum & 0xF0) >> 4) & 0x0F; |
|
| 569 | - if ($msb >=0 && $msb <= 15 ) $msbc = $hex_arr[$msb]; |
|
| 568 | + $msb = (($chksum&0xF0) >> 4)&0x0F; |
|
| 569 | + if ($msb >= 0 && $msb <= 15) $msbc = $hex_arr[$msb]; |
|
| 570 | 570 | else $msbc = '0'; |
| 571 | 571 | $itu = '!'.$itu."*{$msbc}{$lsbc}\r\n"; |
| 572 | 572 | return $itu; |
@@ -591,14 +591,14 @@ discard block |
||
| 591 | 591 | |
| 592 | 592 | public function mmsitype($mmsi) { |
| 593 | 593 | if (strlen($mmsi) == 9) { |
| 594 | - if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS'; |
|
| 595 | - elseif (substr($mmsi,0,3) == '972') return 'MOB (Man Overboard) device'; |
|
| 596 | - elseif (substr($mmsi,0,3) == '970') return 'AIS SART (Search and Rescue Transmitter)'; |
|
| 597 | - elseif (substr($mmsi,0,3) == '111') return 'SAR (Search and Rescue) aircraft'; |
|
| 598 | - elseif (substr($mmsi,0,2) == '98') return 'Auxiliary craft associated with a parent ship'; |
|
| 599 | - elseif (substr($mmsi,0,2) == '99') return 'Aids to Navigation'; |
|
| 600 | - elseif (substr($mmsi,0,2) == '00') return 'Coastal stations'; |
|
| 601 | - elseif (substr($mmsi,0,1) == '0') return 'Group of ships'; |
|
| 594 | + if (substr($mmsi, 0, 3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS'; |
|
| 595 | + elseif (substr($mmsi, 0, 3) == '972') return 'MOB (Man Overboard) device'; |
|
| 596 | + elseif (substr($mmsi, 0, 3) == '970') return 'AIS SART (Search and Rescue Transmitter)'; |
|
| 597 | + elseif (substr($mmsi, 0, 3) == '111') return 'SAR (Search and Rescue) aircraft'; |
|
| 598 | + elseif (substr($mmsi, 0, 2) == '98') return 'Auxiliary craft associated with a parent ship'; |
|
| 599 | + elseif (substr($mmsi, 0, 2) == '99') return 'Aids to Navigation'; |
|
| 600 | + elseif (substr($mmsi, 0, 2) == '00') return 'Coastal stations'; |
|
| 601 | + elseif (substr($mmsi, 0, 1) == '0') return 'Group of ships'; |
|
| 602 | 602 | else return 'Ship'; |
| 603 | 603 | } |
| 604 | 604 | |
@@ -609,19 +609,19 @@ discard block |
||
| 609 | 609 | global $globalDebug; |
| 610 | 610 | $result = array(); |
| 611 | 611 | $data = new stdClass(); |
| 612 | - $start = strpos($buffer,"VDM"); |
|
| 612 | + $start = strpos($buffer, "VDM"); |
|
| 613 | 613 | $tst = substr($buffer, $start - 3); |
| 614 | - $data = $this->process_ais_raw( $tst, "" ); |
|
| 614 | + $data = $this->process_ais_raw($tst, ""); |
|
| 615 | 615 | if (!is_object($data)) { |
| 616 | 616 | //if ($globalDebug) echo '==== Line format not supported : '.$buffer."\n"; |
| 617 | 617 | return array(); |
| 618 | 618 | } |
| 619 | 619 | if ($data->lon != 0) $result['longitude'] = $data->lon; |
| 620 | 620 | if ($data->lat != 0) $result['latitude'] = $data->lat; |
| 621 | - $result['ident'] = trim(str_replace('@','',$data->name)); |
|
| 621 | + $result['ident'] = trim(str_replace('@', '', $data->name)); |
|
| 622 | 622 | $result['timestamp'] = $data->ts; |
| 623 | 623 | $result['mmsi'] = $data->mmsi; |
| 624 | - if (strlen($result['mmsi']) == 8 && susbtr($result['mmsi'],0,3) == '669') $result['mmsi'] = '3'.$result['mmsi']; |
|
| 624 | + if (strlen($result['mmsi']) == 8 && susbtr($result['mmsi'], 0, 3) == '669') $result['mmsi'] = '3'.$result['mmsi']; |
|
| 625 | 625 | $result['mmsi_type'] = $this->mmsitype($result['mmsi']); |
| 626 | 626 | if ($data->sog != -1.0) $result['speed'] = $data->sog; |
| 627 | 627 | if ($data->heading != '') $result['heading'] = $data->heading; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | if (isset($this->all_tracked[$key]['id'])) { |
| 51 | 51 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 52 | 52 | $Marine = new Marine($this->db); |
| 53 | - $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 53 | + $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 62 | 62 | foreach ($this->all_tracked as $key => $flight) { |
| 63 | 63 | if (isset($flight['lastupdate'])) { |
| 64 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 64 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 65 | 65 | if (isset($this->all_tracked[$key]['id'])) { |
| 66 | 66 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
| 67 | 67 | /* |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | //$real_arrival = $this->arrival($key); |
| 73 | 73 | $Marine = new Marine($this->db); |
| 74 | 74 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 75 | - $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed']); |
|
| 75 | + $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed']); |
|
| 76 | 76 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 77 | 77 | } |
| 78 | 78 | // Put in archive |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $send = false; |
| 93 | 93 | |
| 94 | 94 | // SBS format is CSV format |
| 95 | - if(is_array($line) && isset($line['mmsi'])) { |
|
| 95 | + if (is_array($line) && isset($line['mmsi'])) { |
|
| 96 | 96 | //print_r($line); |
| 97 | 97 | if (isset($line['mmsi'])) { |
| 98 | 98 | |
@@ -116,18 +116,18 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | if (!isset($this->all_tracked[$id])) { |
| 118 | 118 | $this->all_tracked[$id] = array(); |
| 119 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 120 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '')); |
|
| 121 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 119 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedMarine' => 0)); |
|
| 120 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'typeid' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '', 'mmsi' => '', 'status' => '', 'imo' => '', 'callsign' => '', 'arrival_code' => '', 'arrival_date' => '')); |
|
| 121 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time())); |
|
| 122 | 122 | if (!isset($line['id'])) { |
| 123 | 123 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 124 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 125 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 124 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 125 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id'])); |
|
| 126 | 126 | if ($globalAllTracked !== FALSE) $dataFound = true; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
| 130 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 130 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi' => $line['mmsi'])); |
|
| 131 | 131 | $Marine = new Marine($this->db); |
| 132 | 132 | $identity = $Marine->getIdentity($line['mmsi']); |
| 133 | 133 | if (!empty($identity)) { |
@@ -139,59 +139,59 @@ discard block |
||
| 139 | 139 | //$dataFound = true; |
| 140 | 140 | } |
| 141 | 141 | if (isset($line['type_id']) && $line['type_id'] != '') { |
| 142 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 142 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $AIS->getShipType($line['type_id']))); |
|
| 143 | 143 | } |
| 144 | 144 | if (isset($line['type']) && $line['type'] != '') { |
| 145 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 145 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type'])); |
|
| 146 | 146 | } |
| 147 | 147 | if (isset($line['imo']) && $line['imo'] != '') { |
| 148 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 148 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('imo' => $line['imo'])); |
|
| 149 | 149 | } |
| 150 | 150 | if (isset($line['callsign']) && $line['callsign'] != '') { |
| 151 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 151 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('callsign' => $line['callsign'])); |
|
| 152 | 152 | } |
| 153 | 153 | if (isset($line['arrival_code']) && $line['arrival_code'] != '') { |
| 154 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 154 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_code' => $line['arrival_code'])); |
|
| 155 | 155 | } |
| 156 | 156 | if (isset($line['arrival_date']) && $line['arrival_date'] != '') { |
| 157 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 157 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_date' => $line['arrival_date'])); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | |
| 161 | 161 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 162 | 162 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 163 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 163 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident']))); |
|
| 164 | 164 | if ($this->all_tracked[$id]['addedMarine'] == 1) { |
| 165 | 165 | $timeelapsed = microtime(true); |
| 166 | 166 | $Marine = new Marine($this->db); |
| 167 | 167 | $fromsource = NULL; |
| 168 | - $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 168 | + $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource); |
|
| 169 | 169 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 170 | 170 | $Marine->db = null; |
| 171 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 171 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 172 | 172 | } |
| 173 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 173 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'])); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | if (isset($line['speed']) && $line['speed'] != '') { |
| 177 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 178 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 177 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed']))); |
|
| 178 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true)); |
|
| 179 | 179 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 180 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 180 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm'); |
|
| 181 | 181 | if ($distance > 1000 && $distance < 10000) { |
| 182 | 182 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 183 | 183 | $speed = $speed*3.6; |
| 184 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 184 | + if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed))); |
|
| 185 | 185 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 190 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 190 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']); |
|
| 191 | 191 | else unset($timediff); |
| 192 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 192 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) { |
|
| 193 | 193 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 194 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 194 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 195 | 195 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 196 | 196 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 197 | 197 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -199,10 +199,10 @@ discard block |
||
| 199 | 199 | if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
| 200 | 200 | $timeelapsed = microtime(true); |
| 201 | 201 | $Marine = new Marine($this->db); |
| 202 | - $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 202 | + $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 203 | 203 | if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
| 204 | 204 | $Marine->db = null; |
| 205 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 205 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 206 | 206 | $this->tmd = 0; |
| 207 | 207 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 208 | 208 | } |
@@ -210,66 +210,66 @@ discard block |
||
| 210 | 210 | |
| 211 | 211 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 212 | 212 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 213 | - if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 213 | + if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 214 | 214 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 215 | 215 | $dataFound = true; |
| 216 | 216 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 217 | 217 | } |
| 218 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
|
| 218 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude'])); |
|
| 219 | 219 | } |
| 220 | 220 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 221 | 221 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 222 | 222 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 223 | - if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 223 | + if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 224 | 224 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 225 | 225 | $dataFound = true; |
| 226 | 226 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 227 | 227 | } |
| 228 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
|
| 228 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude'])); |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | } else if ($globalDebug && $timediff > 20) { |
| 232 | 232 | $this->tmd = $this->tmd + 1; |
| 233 | 233 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 234 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
|
| 235 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 234 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -"; |
|
| 235 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 236 | 236 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 237 | 237 | } |
| 238 | 238 | } |
| 239 | 239 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 240 | 240 | if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 241 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 241 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update'])); |
|
| 242 | 242 | } |
| 243 | 243 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 244 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 244 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source'])); |
|
| 245 | 245 | } |
| 246 | 246 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 247 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 247 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name'])); |
|
| 248 | 248 | } |
| 249 | 249 | if (isset($line['status']) && $line['status'] != '') { |
| 250 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 250 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status' => $line['status'])); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 254 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 254 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true)); |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | if (isset($line['heading']) && $line['heading'] != '') { |
| 258 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 259 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 260 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 258 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 259 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading']))); |
|
| 260 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true)); |
|
| 261 | 261 | //$dataFound = true; |
| 262 | 262 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 263 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 264 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 265 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 263 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 264 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading))); |
|
| 265 | + if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 266 | 266 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
| 267 | 267 | } |
| 268 | 268 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 269 | 269 | |
| 270 | 270 | if (isset($line['datetime'])) { |
| 271 | 271 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
| 272 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
|
| 272 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime'])); |
|
| 273 | 273 | } else { |
| 274 | 274 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
| 275 | 275 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n"; |
@@ -277,48 +277,48 @@ discard block |
||
| 277 | 277 | } |
| 278 | 278 | } else { |
| 279 | 279 | date_default_timezone_set('UTC'); |
| 280 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 280 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | |
| 284 | 284 | if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) { |
| 285 | 285 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 286 | 286 | if ($this->all_tracked[$id]['addedMarine'] == 0) { |
| 287 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 287 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 288 | 288 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 289 | 289 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
| 290 | 290 | $timeelapsed = microtime(true); |
| 291 | 291 | $MarineLive = new MarineLive($this->db); |
| 292 | 292 | if (isset($line['id'])) { |
| 293 | 293 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 294 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 294 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 295 | 295 | } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
| 296 | 296 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 297 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 297 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 298 | 298 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 299 | 299 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 300 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 300 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 301 | 301 | } else $recent_ident = ''; |
| 302 | - $MarineLive->db=null; |
|
| 302 | + $MarineLive->db = null; |
|
| 303 | 303 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 304 | 304 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 305 | 305 | } else { |
| 306 | 306 | $recent_ident = ''; |
| 307 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
|
| 307 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0)); |
|
| 308 | 308 | } |
| 309 | 309 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 310 | - if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 310 | + if ($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 311 | 311 | { |
| 312 | 312 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
| 313 | 313 | //adds the spotter data for the archive |
| 314 | 314 | $highlight = ''; |
| 315 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 315 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 316 | 316 | $timeelapsed = microtime(true); |
| 317 | 317 | $Marine = new Marine($this->db); |
| 318 | - $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 318 | + $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']); |
|
| 319 | 319 | $Marine->db = null; |
| 320 | 320 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 321 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 321 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 322 | 322 | |
| 323 | 323 | /* |
| 324 | 324 | // Add source stat in DB |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | //MarineLive->deleteLiveMarineDataNotUpdated(); |
| 357 | 357 | $MarineLive = new MarineLive($this->db); |
| 358 | 358 | $MarineLive->deleteLiveMarineData(); |
| 359 | - $MarineLive->db=null; |
|
| 359 | + $MarineLive->db = null; |
|
| 360 | 360 | if ($globalDebug) echo " Done\n"; |
| 361 | 361 | $this->last_delete = time(); |
| 362 | 362 | } |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | $this->all_tracked[$id]['addedMarine'] = 1; |
| 366 | 366 | if (isset($globalDaemon) && !$globalDaemon) { |
| 367 | 367 | $Marine = new Marine($this->db); |
| 368 | - $Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
|
| 368 | + $Marine->updateLatestMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']); |
|
| 369 | 369 | $Marine->db = null; |
| 370 | 370 | } |
| 371 | 371 | |
@@ -379,14 +379,14 @@ discard block |
||
| 379 | 379 | $ignoreImport = false; |
| 380 | 380 | |
| 381 | 381 | if (!$ignoreImport) { |
| 382 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 382 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 383 | 383 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 384 | 384 | $timeelapsed = microtime(true); |
| 385 | 385 | $MarineLive = new MarineLive($this->db); |
| 386 | - $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 386 | + $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 387 | 387 | $MarineLive->db = null; |
| 388 | 388 | $this->all_tracked[$id]['putinarchive'] = false; |
| 389 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 389 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 390 | 390 | |
| 391 | 391 | // Put statistics in $this->stats variable |
| 392 | 392 | /* |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 446 | 446 | if ($this->all_tracked[$id]['putinarchive']) $send = true; |
| 447 | 447 | if ($globalDebug) echo $result."\n"; |
| 448 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 448 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 449 | 449 | //$this->del(); |
| 450 | 450 | |
| 451 | 451 | |
@@ -16,33 +16,33 @@ discard block |
||
| 16 | 16 | * @param Array $filter the filter |
| 17 | 17 | * @return Array the SQL part |
| 18 | 18 | */ |
| 19 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
| 22 | 22 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 23 | 23 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 24 | 24 | $filters = $globalStatsFilters[$globalFilterName]; |
| 25 | 25 | } else { |
| 26 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 26 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | - $filters = array_merge($filters,$filter); |
|
| 30 | + $filters = array_merge($filters, $filter); |
|
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 33 | 33 | $filter_query_join = ''; |
| 34 | 34 | $filter_query_where = ''; |
| 35 | - foreach($filters as $flt) { |
|
| 35 | + foreach ($filters as $flt) { |
|
| 36 | 36 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 37 | 37 | if (isset($flt['source'])) { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
| 39 | 39 | } else { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 45 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 45 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 46 | 46 | } |
| 47 | 47 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 48 | 48 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | $filter_query_date .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'"; |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_live.fammarine_id"; |
|
| 74 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_live.fammarine_id"; |
|
| 75 | 75 | } |
| 76 | 76 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 77 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 77 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 78 | 78 | } |
| 79 | 79 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 80 | 80 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 81 | 81 | if ($filter_query_where != '') { |
| 82 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 82 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 83 | 83 | } |
| 84 | 84 | $filter_query = $filter_query_join.$filter_query_where; |
| 85 | 85 | return $filter_query; |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | if ($limit != '') |
| 103 | 103 | { |
| 104 | 104 | $limit_array = explode(',', $limit); |
| 105 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 106 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 105 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 106 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 107 | 107 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 108 | 108 | { |
| 109 | 109 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | } else { |
| 127 | 127 | $query = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate".$filter_query.$orderby_query; |
| 128 | 128 | } |
| 129 | - $spotter_array = $Marine->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 129 | + $spotter_array = $Marine->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 130 | 130 | |
| 131 | 131 | return $spotter_array; |
| 132 | 132 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | global $globalDBdriver, $globalLiveInterval; |
| 143 | 143 | date_default_timezone_set('UTC'); |
| 144 | 144 | |
| 145 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 145 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 146 | 146 | |
| 147 | 147 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 148 | 148 | if ($globalDBdriver == 'mysql') { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | try { |
| 157 | 157 | $sth = $this->db->prepare($query); |
| 158 | 158 | $sth->execute(); |
| 159 | - } catch(PDOException $e) { |
|
| 159 | + } catch (PDOException $e) { |
|
| 160 | 160 | echo $e->getMessage(); |
| 161 | 161 | die; |
| 162 | 162 | } |
@@ -176,15 +176,15 @@ discard block |
||
| 176 | 176 | global $globalDBdriver, $globalLiveInterval; |
| 177 | 177 | date_default_timezone_set('UTC'); |
| 178 | 178 | |
| 179 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 179 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 180 | 180 | |
| 181 | 181 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 182 | 182 | if ($globalDBdriver == 'mysql') { |
| 183 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 183 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 184 | 184 | FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' |
| 185 | 185 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
| 186 | 186 | } else { |
| 187 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 187 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 188 | 188 | FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' |
| 189 | 189 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
| 190 | 190 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | try { |
| 193 | 193 | $sth = $this->db->prepare($query); |
| 194 | 194 | $sth->execute(); |
| 195 | - } catch(PDOException $e) { |
|
| 195 | + } catch (PDOException $e) { |
|
| 196 | 196 | echo $e->getMessage(); |
| 197 | 197 | die; |
| 198 | 198 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | public function getLiveMarineCount($filter = array()) |
| 210 | 210 | { |
| 211 | 211 | global $globalDBdriver, $globalLiveInterval; |
| 212 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 212 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 213 | 213 | |
| 214 | 214 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 215 | 215 | if ($globalDBdriver == 'mysql') { |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | try { |
| 221 | 221 | $sth = $this->db->prepare($query); |
| 222 | 222 | $sth->execute(); |
| 223 | - } catch(PDOException $e) { |
|
| 223 | + } catch (PDOException $e) { |
|
| 224 | 224 | echo $e->getMessage(); |
| 225 | 225 | die; |
| 226 | 226 | } |
@@ -243,10 +243,10 @@ discard block |
||
| 243 | 243 | $filter_query = $this->getFilter($filter); |
| 244 | 244 | |
| 245 | 245 | if (is_array($coord)) { |
| 246 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 247 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 248 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 249 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 246 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 247 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 248 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 249 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 250 | 250 | } else return array(); |
| 251 | 251 | if ($globalDBdriver == 'mysql') { |
| 252 | 252 | $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query; |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | if ($interval == '1m') |
| 299 | 299 | { |
| 300 | 300 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
| 301 | - } else if ($interval == '15m'){ |
|
| 301 | + } else if ($interval == '15m') { |
|
| 302 | 302 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date '; |
| 303 | 303 | } |
| 304 | 304 | } |
@@ -306,14 +306,14 @@ discard block |
||
| 306 | 306 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | - $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
| 309 | + $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
| 310 | 310 | WHERE marine_live.latitude <> '' |
| 311 | 311 | AND marine_live.longitude <> '' |
| 312 | 312 | ".$additional_query." |
| 313 | 313 | HAVING distance < :radius |
| 314 | 314 | ORDER BY distance"; |
| 315 | 315 | |
| 316 | - $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 316 | + $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 317 | 317 | |
| 318 | 318 | return $spotter_array; |
| 319 | 319 | } |
@@ -331,9 +331,9 @@ discard block |
||
| 331 | 331 | date_default_timezone_set('UTC'); |
| 332 | 332 | |
| 333 | 333 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 334 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 334 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 335 | 335 | |
| 336 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 336 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 337 | 337 | |
| 338 | 338 | return $spotter_array; |
| 339 | 339 | } |
@@ -344,16 +344,16 @@ discard block |
||
| 344 | 344 | * @return Array the spotter information |
| 345 | 345 | * |
| 346 | 346 | */ |
| 347 | - public function getDateLiveMarineDataByIdent($ident,$date) |
|
| 347 | + public function getDateLiveMarineDataByIdent($ident, $date) |
|
| 348 | 348 | { |
| 349 | 349 | $Marine = new Marine($this->db); |
| 350 | 350 | date_default_timezone_set('UTC'); |
| 351 | 351 | |
| 352 | 352 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 353 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 353 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 354 | 354 | |
| 355 | - $date = date('c',$date); |
|
| 356 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 355 | + $date = date('c', $date); |
|
| 356 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 357 | 357 | |
| 358 | 358 | return $spotter_array; |
| 359 | 359 | } |
@@ -370,9 +370,9 @@ discard block |
||
| 370 | 370 | date_default_timezone_set('UTC'); |
| 371 | 371 | |
| 372 | 372 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 373 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 373 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 374 | 374 | |
| 375 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 375 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 376 | 376 | |
| 377 | 377 | return $spotter_array; |
| 378 | 378 | } |
@@ -383,15 +383,15 @@ discard block |
||
| 383 | 383 | * @return Array the spotter information |
| 384 | 384 | * |
| 385 | 385 | */ |
| 386 | - public function getDateLiveMarineDataById($id,$date) |
|
| 386 | + public function getDateLiveMarineDataById($id, $date) |
|
| 387 | 387 | { |
| 388 | 388 | $Marine = new Marine($this->db); |
| 389 | 389 | date_default_timezone_set('UTC'); |
| 390 | 390 | |
| 391 | 391 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 392 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 393 | - $date = date('c',$date); |
|
| 394 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 392 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 393 | + $date = date('c', $date); |
|
| 394 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 395 | 395 | |
| 396 | 396 | return $spotter_array; |
| 397 | 397 | } |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | * @return Array the spotter information |
| 404 | 404 | * |
| 405 | 405 | */ |
| 406 | - public function getAllLiveMarineDataById($id,$liveinterval = false) |
|
| 406 | + public function getAllLiveMarineDataById($id, $liveinterval = false) |
|
| 407 | 407 | { |
| 408 | 408 | global $globalDBdriver, $globalLiveInterval; |
| 409 | 409 | date_default_timezone_set('UTC'); |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | try { |
| 423 | 423 | $sth = $this->db->prepare($query); |
| 424 | 424 | $sth->execute(array(':id' => $id)); |
| 425 | - } catch(PDOException $e) { |
|
| 425 | + } catch (PDOException $e) { |
|
| 426 | 426 | echo $e->getMessage(); |
| 427 | 427 | die; |
| 428 | 428 | } |
@@ -440,12 +440,12 @@ discard block |
||
| 440 | 440 | { |
| 441 | 441 | date_default_timezone_set('UTC'); |
| 442 | 442 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 443 | - $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
|
| 443 | + $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
|
| 444 | 444 | try { |
| 445 | 445 | |
| 446 | 446 | $sth = $this->db->prepare($query); |
| 447 | 447 | $sth->execute(array(':ident' => $ident)); |
| 448 | - } catch(PDOException $e) { |
|
| 448 | + } catch (PDOException $e) { |
|
| 449 | 449 | echo $e->getMessage(); |
| 450 | 450 | die; |
| 451 | 451 | } |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | |
| 476 | 476 | $sth = $this->db->prepare($query); |
| 477 | 477 | $sth->execute(); |
| 478 | - } catch(PDOException $e) { |
|
| 478 | + } catch (PDOException $e) { |
|
| 479 | 479 | return "error"; |
| 480 | 480 | } |
| 481 | 481 | |
@@ -498,14 +498,14 @@ discard block |
||
| 498 | 498 | |
| 499 | 499 | $sth = $this->db->prepare($query); |
| 500 | 500 | $sth->execute(); |
| 501 | - } catch(PDOException $e) { |
|
| 501 | + } catch (PDOException $e) { |
|
| 502 | 502 | return "error"; |
| 503 | 503 | } |
| 504 | 504 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
| 505 | 505 | $i = 0; |
| 506 | - $j =0; |
|
| 506 | + $j = 0; |
|
| 507 | 507 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 508 | - foreach($all as $row) |
|
| 508 | + foreach ($all as $row) |
|
| 509 | 509 | { |
| 510 | 510 | $i++; |
| 511 | 511 | $j++; |
@@ -513,9 +513,9 @@ discard block |
||
| 513 | 513 | if ($globalDebug) echo "."; |
| 514 | 514 | try { |
| 515 | 515 | |
| 516 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 516 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 517 | 517 | $sth->execute(); |
| 518 | - } catch(PDOException $e) { |
|
| 518 | + } catch (PDOException $e) { |
|
| 519 | 519 | return "error"; |
| 520 | 520 | } |
| 521 | 521 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
@@ -526,9 +526,9 @@ discard block |
||
| 526 | 526 | if ($i > 0) { |
| 527 | 527 | try { |
| 528 | 528 | |
| 529 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 529 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 530 | 530 | $sth->execute(); |
| 531 | - } catch(PDOException $e) { |
|
| 531 | + } catch (PDOException $e) { |
|
| 532 | 532 | return "error"; |
| 533 | 533 | } |
| 534 | 534 | } |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | |
| 542 | 542 | $sth = $this->db->prepare($query); |
| 543 | 543 | $sth->execute(); |
| 544 | - } catch(PDOException $e) { |
|
| 544 | + } catch (PDOException $e) { |
|
| 545 | 545 | return "error"; |
| 546 | 546 | } |
| 547 | 547 | /* $query_delete = "DELETE FROM marine_live WHERE fammarine_id IN ("; |
@@ -589,13 +589,13 @@ discard block |
||
| 589 | 589 | public function deleteLiveMarineDataByIdent($ident) |
| 590 | 590 | { |
| 591 | 591 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 592 | - $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
|
| 592 | + $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
|
| 593 | 593 | |
| 594 | 594 | try { |
| 595 | 595 | |
| 596 | 596 | $sth = $this->db->prepare($query); |
| 597 | 597 | $sth->execute(array(':ident' => $ident)); |
| 598 | - } catch(PDOException $e) { |
|
| 598 | + } catch (PDOException $e) { |
|
| 599 | 599 | return "error"; |
| 600 | 600 | } |
| 601 | 601 | |
@@ -611,13 +611,13 @@ discard block |
||
| 611 | 611 | public function deleteLiveMarineDataById($id) |
| 612 | 612 | { |
| 613 | 613 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 614 | - $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
|
| 614 | + $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
|
| 615 | 615 | |
| 616 | 616 | try { |
| 617 | 617 | |
| 618 | 618 | $sth = $this->db->prepare($query); |
| 619 | 619 | $sth->execute(array(':id' => $id)); |
| 620 | - } catch(PDOException $e) { |
|
| 620 | + } catch (PDOException $e) { |
|
| 621 | 621 | return "error"; |
| 622 | 622 | } |
| 623 | 623 | |
@@ -635,13 +635,13 @@ discard block |
||
| 635 | 635 | { |
| 636 | 636 | global $globalDBdriver, $globalTimezone; |
| 637 | 637 | if ($globalDBdriver == 'mysql') { |
| 638 | - $query = 'SELECT marine_live.ident FROM marine_live |
|
| 638 | + $query = 'SELECT marine_live.ident FROM marine_live |
|
| 639 | 639 | WHERE marine_live.ident = :ident |
| 640 | 640 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 641 | 641 | AND marine_live.date < UTC_TIMESTAMP()'; |
| 642 | 642 | $query_data = array(':ident' => $ident); |
| 643 | 643 | } else { |
| 644 | - $query = "SELECT marine_live.ident FROM marine_live |
|
| 644 | + $query = "SELECT marine_live.ident FROM marine_live |
|
| 645 | 645 | WHERE marine_live.ident = :ident |
| 646 | 646 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 647 | 647 | AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -650,8 +650,8 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | $sth = $this->db->prepare($query); |
| 652 | 652 | $sth->execute($query_data); |
| 653 | - $ident_result=''; |
|
| 654 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 653 | + $ident_result = ''; |
|
| 654 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 655 | 655 | { |
| 656 | 656 | $ident_result = $row['ident']; |
| 657 | 657 | } |
@@ -668,13 +668,13 @@ discard block |
||
| 668 | 668 | { |
| 669 | 669 | global $globalDBdriver, $globalTimezone; |
| 670 | 670 | if ($globalDBdriver == 'mysql') { |
| 671 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 671 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 672 | 672 | WHERE marine_live.ident = :ident |
| 673 | 673 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 674 | 674 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 675 | 675 | $query_data = array(':ident' => $ident); |
| 676 | 676 | } else { |
| 677 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 677 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 678 | 678 | WHERE marine_live.ident = :ident |
| 679 | 679 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 680 | 680 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -683,8 +683,8 @@ discard block |
||
| 683 | 683 | |
| 684 | 684 | $sth = $this->db->prepare($query); |
| 685 | 685 | $sth->execute($query_data); |
| 686 | - $ident_result=''; |
|
| 687 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 686 | + $ident_result = ''; |
|
| 687 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 688 | 688 | { |
| 689 | 689 | $ident_result = $row['fammarine_id']; |
| 690 | 690 | } |
@@ -701,13 +701,13 @@ discard block |
||
| 701 | 701 | { |
| 702 | 702 | global $globalDBdriver, $globalTimezone; |
| 703 | 703 | if ($globalDBdriver == 'mysql') { |
| 704 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 704 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 705 | 705 | WHERE marine_live.fammarine_id = :id |
| 706 | 706 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 707 | 707 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 708 | 708 | $query_data = array(':id' => $id); |
| 709 | 709 | } else { |
| 710 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 710 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 711 | 711 | WHERE marine_live.fammarine_id = :id |
| 712 | 712 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 713 | 713 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -716,8 +716,8 @@ discard block |
||
| 716 | 716 | |
| 717 | 717 | $sth = $this->db->prepare($query); |
| 718 | 718 | $sth->execute($query_data); |
| 719 | - $ident_result=''; |
|
| 720 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 719 | + $ident_result = ''; |
|
| 720 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 721 | 721 | { |
| 722 | 722 | $ident_result = $row['fammarine_id']; |
| 723 | 723 | } |
@@ -734,13 +734,13 @@ discard block |
||
| 734 | 734 | { |
| 735 | 735 | global $globalDBdriver, $globalTimezone; |
| 736 | 736 | if ($globalDBdriver == 'mysql') { |
| 737 | - $query = 'SELECT marine_live.fammarine_id FROM marine_live |
|
| 737 | + $query = 'SELECT marine_live.fammarine_id FROM marine_live |
|
| 738 | 738 | WHERE marine_live.mmsi = :mmsi |
| 739 | 739 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 740 | 740 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 741 | 741 | $query_data = array(':mmsi' => $mmsi); |
| 742 | 742 | } else { |
| 743 | - $query = "SELECT marine_live.fammarine_id FROM marine_live |
|
| 743 | + $query = "SELECT marine_live.fammarine_id FROM marine_live |
|
| 744 | 744 | WHERE marine_live.mmsi = :mmsi |
| 745 | 745 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 746 | 746 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -749,8 +749,8 @@ discard block |
||
| 749 | 749 | |
| 750 | 750 | $sth = $this->db->prepare($query); |
| 751 | 751 | $sth->execute($query_data); |
| 752 | - $ident_result=''; |
|
| 753 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 752 | + $ident_result = ''; |
|
| 753 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 754 | 754 | { |
| 755 | 755 | $ident_result = $row['fammarine_id']; |
| 756 | 756 | } |
@@ -768,7 +768,7 @@ discard block |
||
| 768 | 768 | * @return String success or false |
| 769 | 769 | * |
| 770 | 770 | */ |
| 771 | - public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
|
| 771 | + public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') |
|
| 772 | 772 | { |
| 773 | 773 | global $globalURL, $globalArchive, $globalDebug; |
| 774 | 774 | $Common = new Common(); |
@@ -820,36 +820,36 @@ discard block |
||
| 820 | 820 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 821 | 821 | |
| 822 | 822 | |
| 823 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 824 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 825 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 826 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 827 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 828 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 829 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 830 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 831 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 832 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 833 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 834 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
| 835 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 836 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 837 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
| 838 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
| 823 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 824 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 825 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 826 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 827 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 828 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 829 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 830 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 831 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 832 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 833 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 834 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
| 835 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 836 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 837 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
| 838 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
| 839 | 839 | |
| 840 | 840 | |
| 841 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 842 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 841 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 842 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 843 | 843 | if ($arrival_date == '') $arrival_date = NULL; |
| 844 | - $query = 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
|
| 844 | + $query = 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
|
| 845 | 845 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)'; |
| 846 | 846 | |
| 847 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date); |
|
| 847 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date); |
|
| 848 | 848 | try { |
| 849 | 849 | |
| 850 | 850 | $sth = $this->db->prepare($query); |
| 851 | 851 | $sth->execute($query_values); |
| 852 | - } catch(PDOException $e) { |
|
| 852 | + } catch (PDOException $e) { |
|
| 853 | 853 | return "error : ".$e->getMessage(); |
| 854 | 854 | } |
| 855 | 855 | /* |
@@ -866,7 +866,7 @@ discard block |
||
| 866 | 866 | |
| 867 | 867 | public function getOrderBy() |
| 868 | 868 | { |
| 869 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_live.date DESC")); |
|
| 869 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_live.date DESC")); |
|
| 870 | 870 | return $orderby; |
| 871 | 871 | } |
| 872 | 872 | |
@@ -14,12 +14,12 @@ discard block |
||
| 14 | 14 | * @param Array $headers header to submit with the form |
| 15 | 15 | * @return String the result |
| 16 | 16 | */ |
| 17 | - public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '') { |
|
| 17 | + public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '') { |
|
| 18 | 18 | global $globalProxy, $globalForceIPv4; |
| 19 | 19 | $ch = curl_init(); |
| 20 | 20 | curl_setopt($ch, CURLOPT_URL, $url); |
| 21 | 21 | if (isset($globalForceIPv4) && $globalForceIPv4) { |
| 22 | - if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){ |
|
| 22 | + if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) { |
|
| 23 | 23 | curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); |
| 24 | 24 | } |
| 25 | 25 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); |
| 30 | 30 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
| 31 | 31 | curl_setopt($ch, CURLINFO_HEADER_OUT, true); |
| 32 | - curl_setopt($ch,CURLOPT_ENCODING , "gzip"); |
|
| 32 | + curl_setopt($ch, CURLOPT_ENCODING, "gzip"); |
|
| 33 | 33 | //curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5'); |
| 34 | 34 | // curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0'); |
| 35 | 35 | if ($useragent == '') { |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | } |
| 40 | 40 | if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); |
| 41 | 41 | else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
| 42 | - curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback")); |
|
| 42 | + curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback")); |
|
| 43 | 43 | if ($type == 'post') { |
| 44 | 44 | curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); |
| 45 | 45 | if (is_array($data)) { |
| 46 | 46 | curl_setopt($ch, CURLOPT_POST, count($data)); |
| 47 | 47 | $data_string = ''; |
| 48 | - foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; } |
|
| 48 | + foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; } |
|
| 49 | 49 | rtrim($data_string, '&'); |
| 50 | 50 | curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string); |
| 51 | 51 | } else { |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | if ($cookie != '') { |
| 59 | 59 | if (is_array($cookie)) { |
| 60 | - curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';')); |
|
| 60 | + curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';')); |
|
| 61 | 61 | } else { |
| 62 | 62 | curl_setopt($ch, CURLOPT_COOKIE, $cookie); |
| 63 | 63 | } |
@@ -69,13 +69,13 @@ discard block |
||
| 69 | 69 | $info = curl_getinfo($ch); |
| 70 | 70 | //var_dump($info); |
| 71 | 71 | curl_close($ch); |
| 72 | - if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) { |
|
| 72 | + if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) { |
|
| 73 | 73 | echo "Cloudflare Detected\n"; |
| 74 | 74 | require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php'); |
| 75 | 75 | $useragent = UAgent::random(); |
| 76 | 76 | cloudflare::useUserAgent($useragent); |
| 77 | 77 | if ($clearanceCookie = cloudflare::bypass($url)) { |
| 78 | - return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent); |
|
| 78 | + return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent); |
|
| 79 | 79 | } |
| 80 | 80 | } else { |
| 81 | 81 | return $result; |
@@ -116,27 +116,27 @@ discard block |
||
| 116 | 116 | if ($data == '') return array(); |
| 117 | 117 | $html = str_get_html($data); |
| 118 | 118 | if ($html === false) return array(); |
| 119 | - $tabledata=array(); |
|
| 120 | - foreach($html->find('tr') as $element) |
|
| 119 | + $tabledata = array(); |
|
| 120 | + foreach ($html->find('tr') as $element) |
|
| 121 | 121 | { |
| 122 | 122 | $td = array(); |
| 123 | - foreach( $element->find('th') as $row) |
|
| 123 | + foreach ($element->find('th') as $row) |
|
| 124 | 124 | { |
| 125 | 125 | $td [] = trim($row->plaintext); |
| 126 | 126 | } |
| 127 | - $td=array_filter($td); |
|
| 127 | + $td = array_filter($td); |
|
| 128 | 128 | $tabledata[] = $td; |
| 129 | 129 | |
| 130 | 130 | $td = array(); |
| 131 | 131 | $tdi = array(); |
| 132 | - foreach( $element->find('td') as $row) |
|
| 132 | + foreach ($element->find('td') as $row) |
|
| 133 | 133 | { |
| 134 | 134 | $td [] = trim($row->plaintext); |
| 135 | 135 | $tdi [] = trim($row->innertext); |
| 136 | 136 | } |
| 137 | - $td=array_filter($td); |
|
| 138 | - $tdi=array_filter($tdi); |
|
| 139 | - $tabledata[]=array_merge($td,$tdi); |
|
| 137 | + $td = array_filter($td); |
|
| 138 | + $tdi = array_filter($tdi); |
|
| 139 | + $tabledata[] = array_merge($td, $tdi); |
|
| 140 | 140 | } |
| 141 | 141 | $html->clear(); |
| 142 | 142 | unset($html); |
@@ -151,8 +151,8 @@ discard block |
||
| 151 | 151 | public function text2array($data) { |
| 152 | 152 | $html = str_get_html($data); |
| 153 | 153 | if ($html === false) return array(); |
| 154 | - $tabledata=array(); |
|
| 155 | - foreach($html->find('p') as $element) |
|
| 154 | + $tabledata = array(); |
|
| 155 | + foreach ($html->find('p') as $element) |
|
| 156 | 156 | { |
| 157 | 157 | $tabledata [] = trim($element->plaintext); |
| 158 | 158 | } |
@@ -172,11 +172,11 @@ discard block |
||
| 172 | 172 | */ |
| 173 | 173 | public function distance($lat, $lon, $latc, $lonc, $unit = 'km') { |
| 174 | 174 | if ($lat == $latc && $lon == $lonc) return 0; |
| 175 | - $dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515; |
|
| 175 | + $dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515; |
|
| 176 | 176 | if ($unit == "km") { |
| 177 | - return round($dist * 1.609344); |
|
| 177 | + return round($dist*1.609344); |
|
| 178 | 178 | } elseif ($unit == "m") { |
| 179 | - return round($dist * 1.609344 * 1000); |
|
| 179 | + return round($dist*1.609344*1000); |
|
| 180 | 180 | } elseif ($unit == "mile" || $unit == "mi") { |
| 181 | 181 | return round($dist); |
| 182 | 182 | } elseif ($unit == "nm") { |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | * @param float $distance distance covered |
| 193 | 193 | * @return whether distance is realistic |
| 194 | 194 | */ |
| 195 | - public function withinThreshold ($timeDifference, $distance) { |
|
| 195 | + public function withinThreshold($timeDifference, $distance) { |
|
| 196 | 196 | $x = abs($timeDifference); |
| 197 | 197 | $d = abs($distance); |
| 198 | 198 | if ($x == 0 || $d == 0) return true; |
@@ -208,12 +208,12 @@ discard block |
||
| 208 | 208 | return ($array !== array_values($array)); |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - public function isInteger($input){ |
|
| 211 | + public function isInteger($input) { |
|
| 212 | 212 | return(ctype_digit(strval($input))); |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | |
| 216 | - public function convertDec($dms,$latlong) { |
|
| 216 | + public function convertDec($dms, $latlong) { |
|
| 217 | 217 | if ($latlong == 'latitude') { |
| 218 | 218 | $deg = substr($dms, 0, 2); |
| 219 | 219 | $min = substr($dms, 2, 4); |
@@ -221,10 +221,10 @@ discard block |
||
| 221 | 221 | $deg = substr($dms, 0, 3); |
| 222 | 222 | $min = substr($dms, 3, 5); |
| 223 | 223 | } |
| 224 | - return $deg+(($min*60)/3600); |
|
| 224 | + return $deg + (($min*60)/3600); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - public function convertDM($coord,$latlong) { |
|
| 227 | + public function convertDM($coord, $latlong) { |
|
| 228 | 228 | if ($latlong == 'latitude') { |
| 229 | 229 | if ($coord < 0) $NSEW = 'S'; |
| 230 | 230 | else $NSEW = 'N'; |
@@ -234,9 +234,9 @@ discard block |
||
| 234 | 234 | } |
| 235 | 235 | $coord = abs($coord); |
| 236 | 236 | $deg = floor($coord); |
| 237 | - $coord = ($coord-$deg)*60; |
|
| 237 | + $coord = ($coord - $deg)*60; |
|
| 238 | 238 | $min = $coord; |
| 239 | - return array('deg' => $deg,'min' => $min,'NSEW' => $NSEW); |
|
| 239 | + return array('deg' => $deg, 'min' => $min, 'NSEW' => $NSEW); |
|
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | /** |
@@ -248,8 +248,8 @@ discard block |
||
| 248 | 248 | public function xcopy($source, $dest) |
| 249 | 249 | { |
| 250 | 250 | $files = glob($source.'*.*'); |
| 251 | - foreach($files as $file){ |
|
| 252 | - $file_to_go = str_replace($source,$dest,$file); |
|
| 251 | + foreach ($files as $file) { |
|
| 252 | + $file_to_go = str_replace($source, $dest, $file); |
|
| 253 | 253 | copy($file, $file_to_go); |
| 254 | 254 | } |
| 255 | 255 | return true; |
@@ -260,9 +260,9 @@ discard block |
||
| 260 | 260 | * @param String $url url to check |
| 261 | 261 | * @return bool Return true on succes false on failure |
| 262 | 262 | */ |
| 263 | - public function urlexist($url){ |
|
| 264 | - $headers=get_headers($url); |
|
| 265 | - return stripos($headers[0],"200 OK")?true:false; |
|
| 263 | + public function urlexist($url) { |
|
| 264 | + $headers = get_headers($url); |
|
| 265 | + return stripos($headers[0], "200 OK") ? true : false; |
|
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | /** |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | public function hex2str($hex) { |
| 274 | 274 | $str = ''; |
| 275 | 275 | $hexln = strlen($hex); |
| 276 | - for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2))); |
|
| 276 | + for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2))); |
|
| 277 | 277 | return $str; |
| 278 | 278 | } |
| 279 | 279 | |
@@ -282,33 +282,33 @@ discard block |
||
| 282 | 282 | //difference in longitudinal coordinates |
| 283 | 283 | $dLon = deg2rad($lon2) - deg2rad($lon1); |
| 284 | 284 | //difference in the phi of latitudinal coordinates |
| 285 | - $dPhi = log(tan(deg2rad($lat2) / 2 + pi() / 4) / tan(deg2rad($lat1) / 2 + pi() / 4)); |
|
| 285 | + $dPhi = log(tan(deg2rad($lat2)/2 + pi()/4)/tan(deg2rad($lat1)/2 + pi()/4)); |
|
| 286 | 286 | //we need to recalculate $dLon if it is greater than pi |
| 287 | - if(abs($dLon) > pi()) { |
|
| 288 | - if($dLon > 0) { |
|
| 289 | - $dLon = (2 * pi() - $dLon) * -1; |
|
| 287 | + if (abs($dLon) > pi()) { |
|
| 288 | + if ($dLon > 0) { |
|
| 289 | + $dLon = (2*pi() - $dLon)*-1; |
|
| 290 | 290 | } else { |
| 291 | - $dLon = 2 * pi() + $dLon; |
|
| 291 | + $dLon = 2*pi() + $dLon; |
|
| 292 | 292 | } |
| 293 | 293 | } |
| 294 | 294 | //return the angle, normalized |
| 295 | - return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360; |
|
| 295 | + return (rad2deg(atan2($dLon, $dPhi)) + 360)%360; |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | - public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.2) { |
|
| 298 | + public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.2) { |
|
| 299 | 299 | //$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1); |
| 300 | - $a = -($lon2-$lon1); |
|
| 300 | + $a = -($lon2 - $lon1); |
|
| 301 | 301 | $b = $lat2 - $lat1; |
| 302 | - $c = -($a*$lat1+$b*$lon1); |
|
| 303 | - $d = $a*$lat3+$b*$lon3+$c; |
|
| 302 | + $c = -($a*$lat1 + $b*$lon1); |
|
| 303 | + $d = $a*$lat3 + $b*$lon3 + $c; |
|
| 304 | 304 | if ($d > -$approx && $d < $approx) return true; |
| 305 | 305 | else return false; |
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | public function array_merge_noappend() { |
| 309 | 309 | $output = array(); |
| 310 | - foreach(func_get_args() as $array) { |
|
| 311 | - foreach($array as $key => $value) { |
|
| 310 | + foreach (func_get_args() as $array) { |
|
| 311 | + foreach ($array as $key => $value) { |
|
| 312 | 312 | $output[$key] = isset($output[$key]) ? |
| 313 | 313 | array_merge($output[$key], $value) : $value; |
| 314 | 314 | } |
@@ -372,34 +372,34 @@ discard block |
||
| 372 | 372 | return $result; |
| 373 | 373 | } |
| 374 | 374 | |
| 375 | - public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1){ |
|
| 375 | + public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1) { |
|
| 376 | 376 | global $globalMapRefresh; |
| 377 | 377 | $distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000; |
| 378 | 378 | $r = 6378; |
| 379 | 379 | $latitude = deg2rad($latitude); |
| 380 | 380 | $longitude = deg2rad($longitude); |
| 381 | 381 | $bearing = deg2rad($heading); |
| 382 | - $latitude2 = asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) ); |
|
| 383 | - $longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) ); |
|
| 384 | - return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.','')); |
|
| 382 | + $latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing))); |
|
| 383 | + $longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2))); |
|
| 384 | + return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', '')); |
|
| 385 | 385 | } |
| 386 | 386 | |
| 387 | - public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) { |
|
| 387 | + public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) { |
|
| 388 | 388 | // distance in meter |
| 389 | 389 | $R = 6378.14; |
| 390 | - $latitude1 = $latitude * (M_PI/180); |
|
| 391 | - $longitude1 = $longitude * (M_PI/180); |
|
| 392 | - $brng = $bearing * (M_PI/180); |
|
| 390 | + $latitude1 = $latitude*(M_PI/180); |
|
| 391 | + $longitude1 = $longitude*(M_PI/180); |
|
| 392 | + $brng = $bearing*(M_PI/180); |
|
| 393 | 393 | $d = $distance; |
| 394 | 394 | |
| 395 | 395 | $latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng)); |
| 396 | - $longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2)); |
|
| 396 | + $longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2)); |
|
| 397 | 397 | |
| 398 | - $latitude2 = $latitude2 * (180/M_PI); |
|
| 399 | - $longitude2 = $longitude2 * (180/M_PI); |
|
| 398 | + $latitude2 = $latitude2*(180/M_PI); |
|
| 399 | + $longitude2 = $longitude2*(180/M_PI); |
|
| 400 | 400 | |
| 401 | - $flat = round ($latitude2,6); |
|
| 402 | - $flong = round ($longitude2,6); |
|
| 401 | + $flat = round($latitude2, 6); |
|
| 402 | + $flong = round($longitude2, 6); |
|
| 403 | 403 | /* |
| 404 | 404 | $dx = $distance*cos($bearing); |
| 405 | 405 | $dy = $distance*sin($bearing); |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | $flong = $longitude + $dlong; |
| 409 | 409 | $flat = $latitude + $dlat; |
| 410 | 410 | */ |
| 411 | - return array('latitude' => $flat,'longitude' => $flong); |
|
| 411 | + return array('latitude' => $flat, 'longitude' => $flong); |
|
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | /** |
@@ -422,14 +422,14 @@ discard block |
||
| 422 | 422 | * @param integer $level GZIP compression level (default: 9) |
| 423 | 423 | * @return string New filename (with .gz appended) if success, or false if operation fails |
| 424 | 424 | */ |
| 425 | - public function gzCompressFile($source, $level = 9){ |
|
| 426 | - $dest = $source . '.gz'; |
|
| 427 | - $mode = 'wb' . $level; |
|
| 425 | + public function gzCompressFile($source, $level = 9) { |
|
| 426 | + $dest = $source.'.gz'; |
|
| 427 | + $mode = 'wb'.$level; |
|
| 428 | 428 | $error = false; |
| 429 | 429 | if ($fp_out = gzopen($dest, $mode)) { |
| 430 | - if ($fp_in = fopen($source,'rb')) { |
|
| 430 | + if ($fp_in = fopen($source, 'rb')) { |
|
| 431 | 431 | while (!feof($fp_in)) |
| 432 | - gzwrite($fp_out, fread($fp_in, 1024 * 512)); |
|
| 432 | + gzwrite($fp_out, fread($fp_in, 1024*512)); |
|
| 433 | 433 | fclose($fp_in); |
| 434 | 434 | } else { |
| 435 | 435 | $error = true; |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | } |
| 446 | 446 | |
| 447 | 447 | public function remove_accents($string) { |
| 448 | - if ( !preg_match('/[\x80-\xff]/', $string) ) return $string; |
|
| 448 | + if (!preg_match('/[\x80-\xff]/', $string)) return $string; |
|
| 449 | 449 | $chars = array( |
| 450 | 450 | // Decompositions for Latin-1 Supplement |
| 451 | 451 | chr(195).chr(128) => 'A', chr(195).chr(129) => 'A', |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | chr(196).chr(172) => 'I', chr(196).chr(173) => 'i', |
| 503 | 503 | chr(196).chr(174) => 'I', chr(196).chr(175) => 'i', |
| 504 | 504 | chr(196).chr(176) => 'I', chr(196).chr(177) => 'i', |
| 505 | - chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij', |
|
| 505 | + chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij', |
|
| 506 | 506 | chr(196).chr(180) => 'J', chr(196).chr(181) => 'j', |
| 507 | 507 | chr(196).chr(182) => 'K', chr(196).chr(183) => 'k', |
| 508 | 508 | chr(196).chr(184) => 'k', chr(196).chr(185) => 'L', |
@@ -518,13 +518,13 @@ discard block |
||
| 518 | 518 | chr(197).chr(140) => 'O', chr(197).chr(141) => 'o', |
| 519 | 519 | chr(197).chr(142) => 'O', chr(197).chr(143) => 'o', |
| 520 | 520 | chr(197).chr(144) => 'O', chr(197).chr(145) => 'o', |
| 521 | - chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe', |
|
| 522 | - chr(197).chr(148) => 'R',chr(197).chr(149) => 'r', |
|
| 523 | - chr(197).chr(150) => 'R',chr(197).chr(151) => 'r', |
|
| 524 | - chr(197).chr(152) => 'R',chr(197).chr(153) => 'r', |
|
| 525 | - chr(197).chr(154) => 'S',chr(197).chr(155) => 's', |
|
| 526 | - chr(197).chr(156) => 'S',chr(197).chr(157) => 's', |
|
| 527 | - chr(197).chr(158) => 'S',chr(197).chr(159) => 's', |
|
| 521 | + chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe', |
|
| 522 | + chr(197).chr(148) => 'R', chr(197).chr(149) => 'r', |
|
| 523 | + chr(197).chr(150) => 'R', chr(197).chr(151) => 'r', |
|
| 524 | + chr(197).chr(152) => 'R', chr(197).chr(153) => 'r', |
|
| 525 | + chr(197).chr(154) => 'S', chr(197).chr(155) => 's', |
|
| 526 | + chr(197).chr(156) => 'S', chr(197).chr(157) => 's', |
|
| 527 | + chr(197).chr(158) => 'S', chr(197).chr(159) => 's', |
|
| 528 | 528 | chr(197).chr(160) => 'S', chr(197).chr(161) => 's', |
| 529 | 529 | chr(197).chr(162) => 'T', chr(197).chr(163) => 't', |
| 530 | 530 | chr(197).chr(164) => 'T', chr(197).chr(165) => 't', |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | for ($i = 0, $int = '', $concat_flag = true; $i < $length; $i++) { |
| 559 | 559 | if (is_numeric($string[$i]) && $concat_flag) { |
| 560 | 560 | $int .= $string[$i]; |
| 561 | - } elseif(!$concat && $concat_flag && strlen($int) > 0) { |
|
| 561 | + } elseif (!$concat && $concat_flag && strlen($int) > 0) { |
|
| 562 | 562 | $concat_flag = false; |
| 563 | 563 | } |
| 564 | 564 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 5 | 5 | $global_query = "SELECT marine_output.* FROM marine_output"; |
| 6 | 6 | |
| 7 | -class Marine{ |
|
| 7 | +class Marine { |
|
| 8 | 8 | public $db; |
| 9 | 9 | |
| 10 | 10 | public function __construct($dbc = null) { |
@@ -18,33 +18,33 @@ discard block |
||
| 18 | 18 | * @return Array the SQL part |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 21 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 22 | 22 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 23 | 23 | $filters = array(); |
| 24 | 24 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 25 | 25 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 26 | 26 | $filters = $globalStatsFilters[$globalFilterName]; |
| 27 | 27 | } else { |
| 28 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 28 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | if (isset($filter[0]['source'])) { |
| 32 | - $filters = array_merge($filters,$filter); |
|
| 32 | + $filters = array_merge($filters, $filter); |
|
| 33 | 33 | } |
| 34 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 34 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 35 | 35 | $filter_query_join = ''; |
| 36 | 36 | $filter_query_where = ''; |
| 37 | - foreach($filters as $flt) { |
|
| 37 | + foreach ($filters as $flt) { |
|
| 38 | 38 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 39 | 39 | if (isset($flt['source'])) { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 41 | 41 | } else { |
| 42 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 42 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 47 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 47 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 48 | 48 | } |
| 49 | 49 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 50 | 50 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 74 | 74 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 75 | 75 | if ($filter_query_where != '') { |
| 76 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 76 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 77 | 77 | } |
| 78 | 78 | $filter_query = $filter_query_join.$filter_query_where; |
| 79 | 79 | return $filter_query; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * @return Array the spotter information |
| 89 | 89 | * |
| 90 | 90 | */ |
| 91 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 91 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 92 | 92 | { |
| 93 | 93 | date_default_timezone_set('UTC'); |
| 94 | 94 | if (!is_string($query)) |
@@ -108,13 +108,13 @@ discard block |
||
| 108 | 108 | $sth = $this->db->prepare($query.$limitQuery); |
| 109 | 109 | $sth->execute($params); |
| 110 | 110 | } catch (PDOException $e) { |
| 111 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 111 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 112 | 112 | exit(); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | $num_rows = 0; |
| 116 | 116 | $spotter_array = array(); |
| 117 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 117 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 118 | 118 | { |
| 119 | 119 | $num_rows++; |
| 120 | 120 | $temp_array = array(); |
@@ -169,17 +169,17 @@ discard block |
||
| 169 | 169 | { |
| 170 | 170 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 171 | 171 | } else { |
| 172 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 172 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 173 | 173 | } |
| 174 | 174 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 175 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 176 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 175 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 176 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 177 | 177 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 178 | 178 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 179 | 179 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
| 180 | 180 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 181 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 182 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 181 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 182 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 183 | 183 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 184 | 184 | } |
| 185 | 185 | } |
@@ -216,8 +216,8 @@ discard block |
||
| 216 | 216 | { |
| 217 | 217 | $limit_array = explode(",", $limit); |
| 218 | 218 | |
| 219 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 220 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 219 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 220 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 221 | 221 | |
| 222 | 222 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 223 | 223 | { |
@@ -234,9 +234,9 @@ discard block |
||
| 234 | 234 | $orderby_query = " ORDER BY marine_output.date DESC"; |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - $query = $global_query.$filter_query." ".$orderby_query; |
|
| 237 | + $query = $global_query.$filter_query." ".$orderby_query; |
|
| 238 | 238 | |
| 239 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 239 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 240 | 240 | |
| 241 | 241 | return $spotter_array; |
| 242 | 242 | } |
@@ -255,8 +255,8 @@ discard block |
||
| 255 | 255 | if ($id == '') return array(); |
| 256 | 256 | $additional_query = "marine_output.fammarine_id = :id"; |
| 257 | 257 | $query_values = array(':id' => $id); |
| 258 | - $query = $global_query." WHERE ".$additional_query." "; |
|
| 259 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
| 258 | + $query = $global_query." WHERE ".$additional_query." "; |
|
| 259 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
| 260 | 260 | return $spotter_array; |
| 261 | 261 | } |
| 262 | 262 | |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | $query_values = array(); |
| 276 | 276 | $limit_query = ''; |
| 277 | 277 | $additional_query = ''; |
| 278 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 278 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 279 | 279 | if ($ident != "") |
| 280 | 280 | { |
| 281 | 281 | if (!is_string($ident)) |
@@ -291,8 +291,8 @@ discard block |
||
| 291 | 291 | { |
| 292 | 292 | $limit_array = explode(",", $limit); |
| 293 | 293 | |
| 294 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 295 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 294 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 295 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 296 | 296 | |
| 297 | 297 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 298 | 298 | { |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | return $spotter_array; |
| 317 | 317 | } |
| 318 | 318 | |
| 319 | - public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
| 319 | + public function getSpotterDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 320 | 320 | { |
| 321 | 321 | global $global_query, $globalTimezone, $globalDBdriver; |
| 322 | 322 | |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | $limit_query = ''; |
| 325 | 325 | $additional_query = ''; |
| 326 | 326 | |
| 327 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 327 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 328 | 328 | |
| 329 | 329 | if ($date != "") |
| 330 | 330 | { |
@@ -350,8 +350,8 @@ discard block |
||
| 350 | 350 | { |
| 351 | 351 | $limit_array = explode(",", $limit); |
| 352 | 352 | |
| 353 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 354 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 353 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 354 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 355 | 355 | |
| 356 | 356 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 357 | 357 | { |
@@ -382,11 +382,11 @@ discard block |
||
| 382 | 382 | * @return Array list of source name |
| 383 | 383 | * |
| 384 | 384 | */ |
| 385 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 385 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 386 | 386 | { |
| 387 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 387 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 388 | 388 | $query_values = array(); |
| 389 | - $query = "SELECT DISTINCT marine_output.source_name |
|
| 389 | + $query = "SELECT DISTINCT marine_output.source_name |
|
| 390 | 390 | FROM marine_output".$filter_query." marine_output.source_name <> ''"; |
| 391 | 391 | if ($type != '') { |
| 392 | 392 | $query_values = array(':type' => $type); |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | $source_array = array(); |
| 402 | 402 | $temp_array = array(); |
| 403 | 403 | |
| 404 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 404 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 405 | 405 | { |
| 406 | 406 | $temp_array['source_name'] = $row['source_name']; |
| 407 | 407 | $source_array[] = $temp_array; |
@@ -418,8 +418,8 @@ discard block |
||
| 418 | 418 | */ |
| 419 | 419 | public function getAllIdents($filters = array()) |
| 420 | 420 | { |
| 421 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 422 | - $query = "SELECT DISTINCT marine_output.ident |
|
| 421 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 422 | + $query = "SELECT DISTINCT marine_output.ident |
|
| 423 | 423 | FROM marine_output".$filter_query." marine_output.ident <> '' |
| 424 | 424 | ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0"; |
| 425 | 425 | |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | $ident_array = array(); |
| 430 | 430 | $temp_array = array(); |
| 431 | 431 | |
| 432 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 432 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 433 | 433 | { |
| 434 | 434 | $temp_array['ident'] = $row['ident']; |
| 435 | 435 | $ident_array[] = $temp_array; |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | */ |
| 447 | 447 | public function getIdentity($mmsi) |
| 448 | 448 | { |
| 449 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 449 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 450 | 450 | $query = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1"; |
| 451 | 451 | $sth = $this->db->prepare($query); |
| 452 | 452 | $sth->execute(array(':mmsi' => $mmsi)); |
@@ -471,12 +471,12 @@ discard block |
||
| 471 | 471 | } else $offset = '+00:00'; |
| 472 | 472 | |
| 473 | 473 | if ($globalDBdriver == 'mysql') { |
| 474 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
| 474 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
| 475 | 475 | FROM marine_output |
| 476 | 476 | WHERE marine_output.date <> '' |
| 477 | 477 | ORDER BY marine_output.date ASC LIMIT 0,200"; |
| 478 | 478 | } else { |
| 479 | - $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 479 | + $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 480 | 480 | FROM marine_output |
| 481 | 481 | WHERE marine_output.date <> '' |
| 482 | 482 | ORDER BY marine_output.date ASC LIMIT 0,200"; |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | $date_array = array(); |
| 489 | 489 | $temp_array = array(); |
| 490 | 490 | |
| 491 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 491 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 492 | 492 | { |
| 493 | 493 | $temp_array['date'] = $row['date']; |
| 494 | 494 | |
@@ -507,11 +507,11 @@ discard block |
||
| 507 | 507 | * @return String success or false |
| 508 | 508 | * |
| 509 | 509 | */ |
| 510 | - public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL) |
|
| 510 | + public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL) |
|
| 511 | 511 | { |
| 512 | 512 | |
| 513 | 513 | $query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id'; |
| 514 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident); |
|
| 514 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident); |
|
| 515 | 515 | |
| 516 | 516 | try { |
| 517 | 517 | $sth = $this->db->prepare($query); |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '') |
| 535 | 535 | { |
| 536 | 536 | $query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id'; |
| 537 | - $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 537 | + $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident); |
|
| 538 | 538 | |
| 539 | 539 | try { |
| 540 | 540 | $sth = $this->db->prepare($query); |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | * @param String $verticalrate vertival rate of flight |
| 573 | 573 | * @return String success or false |
| 574 | 574 | */ |
| 575 | - public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$format_source = '', $source_name = '') |
|
| 575 | + public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $format_source = '', $source_name = '') |
|
| 576 | 576 | { |
| 577 | 577 | global $globalURL; |
| 578 | 578 | |
@@ -639,25 +639,25 @@ discard block |
||
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | |
| 642 | - if ($date == "" || strtotime($date) < time()-20*60) |
|
| 642 | + if ($date == "" || strtotime($date) < time() - 20*60) |
|
| 643 | 643 | { |
| 644 | 644 | $date = date("Y-m-d H:i:s", time()); |
| 645 | 645 | } |
| 646 | 646 | |
| 647 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 648 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 649 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 650 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 651 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 652 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 653 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 654 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 655 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 656 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
| 657 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 658 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 659 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
| 660 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
| 647 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 648 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 649 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 650 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 651 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 652 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 653 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 654 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 655 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 656 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
| 657 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 658 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 659 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
| 660 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
| 661 | 661 | |
| 662 | 662 | if ($latitude == '' && $longitude == '') { |
| 663 | 663 | $latitude = 0; |
@@ -666,10 +666,10 @@ discard block |
||
| 666 | 666 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 667 | 667 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 668 | 668 | if ($arrival_date == '') $arrival_date = NULL; |
| 669 | - $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) |
|
| 669 | + $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) |
|
| 670 | 670 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)"; |
| 671 | 671 | |
| 672 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date); |
|
| 672 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date); |
|
| 673 | 673 | try { |
| 674 | 674 | |
| 675 | 675 | $sth = $this->db->prepare($query); |
@@ -694,13 +694,13 @@ discard block |
||
| 694 | 694 | { |
| 695 | 695 | global $globalDBdriver, $globalTimezone; |
| 696 | 696 | if ($globalDBdriver == 'mysql') { |
| 697 | - $query = "SELECT marine_output.ident FROM marine_output |
|
| 697 | + $query = "SELECT marine_output.ident FROM marine_output |
|
| 698 | 698 | WHERE marine_output.ident = :ident |
| 699 | 699 | AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 700 | 700 | AND marine_output.date < UTC_TIMESTAMP()"; |
| 701 | 701 | $query_data = array(':ident' => $ident); |
| 702 | 702 | } else { |
| 703 | - $query = "SELECT marine_output.ident FROM marine_output |
|
| 703 | + $query = "SELECT marine_output.ident FROM marine_output |
|
| 704 | 704 | WHERE marine_output.ident = :ident |
| 705 | 705 | AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 706 | 706 | AND marine_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -709,8 +709,8 @@ discard block |
||
| 709 | 709 | |
| 710 | 710 | $sth = $this->db->prepare($query); |
| 711 | 711 | $sth->execute($query_data); |
| 712 | - $ident_result=''; |
|
| 713 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 712 | + $ident_result = ''; |
|
| 713 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 714 | 714 | { |
| 715 | 715 | $ident_result = $row['ident']; |
| 716 | 716 | } |
@@ -736,8 +736,8 @@ discard block |
||
| 736 | 736 | return false; |
| 737 | 737 | } else { |
| 738 | 738 | $q_array = explode(" ", $q); |
| 739 | - foreach ($q_array as $q_item){ |
|
| 740 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 739 | + foreach ($q_array as $q_item) { |
|
| 740 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 741 | 741 | $additional_query .= " AND ("; |
| 742 | 742 | $additional_query .= "(marine_output.ident like '%".$q_item."%')"; |
| 743 | 743 | $additional_query .= ")"; |
@@ -745,11 +745,11 @@ discard block |
||
| 745 | 745 | } |
| 746 | 746 | } |
| 747 | 747 | if ($globalDBdriver == 'mysql') { |
| 748 | - $query = "SELECT marine_output.* FROM marine_output |
|
| 748 | + $query = "SELECT marine_output.* FROM marine_output |
|
| 749 | 749 | WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 750 | 750 | AND marine_output.date < UTC_TIMESTAMP()"; |
| 751 | 751 | } else { |
| 752 | - $query = "SELECT marine_output.* FROM marine_output |
|
| 752 | + $query = "SELECT marine_output.* FROM marine_output |
|
| 753 | 753 | WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 754 | 754 | AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 755 | 755 | } |
@@ -822,11 +822,11 @@ discard block |
||
| 822 | 822 | * @return Array the callsign list |
| 823 | 823 | * |
| 824 | 824 | */ |
| 825 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 825 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 826 | 826 | { |
| 827 | 827 | global $globalDBdriver; |
| 828 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 829 | - $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
| 828 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 829 | + $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
| 830 | 830 | FROM marine_output".$filter_query." marine_output.ident <> ''"; |
| 831 | 831 | if ($olderthanmonths > 0) { |
| 832 | 832 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -840,28 +840,28 @@ discard block |
||
| 840 | 840 | if ($year != '') { |
| 841 | 841 | if ($globalDBdriver == 'mysql') { |
| 842 | 842 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 843 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 843 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 844 | 844 | } else { |
| 845 | 845 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 846 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 846 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 847 | 847 | } |
| 848 | 848 | } |
| 849 | 849 | if ($month != '') { |
| 850 | 850 | if ($globalDBdriver == 'mysql') { |
| 851 | 851 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 852 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 852 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 853 | 853 | } else { |
| 854 | 854 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 855 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 855 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 856 | 856 | } |
| 857 | 857 | } |
| 858 | 858 | if ($day != '') { |
| 859 | 859 | if ($globalDBdriver == 'mysql') { |
| 860 | 860 | $query .= " AND DAY(marine_output.date) = :day"; |
| 861 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 861 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 862 | 862 | } else { |
| 863 | 863 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 864 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 864 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 865 | 865 | } |
| 866 | 866 | } |
| 867 | 867 | $query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | $callsign_array = array(); |
| 874 | 874 | $temp_array = array(); |
| 875 | 875 | |
| 876 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 876 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 877 | 877 | { |
| 878 | 878 | $temp_array['callsign_icao'] = $row['ident']; |
| 879 | 879 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -925,7 +925,7 @@ discard block |
||
| 925 | 925 | $date_array = array(); |
| 926 | 926 | $temp_array = array(); |
| 927 | 927 | |
| 928 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 928 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 929 | 929 | { |
| 930 | 930 | $temp_array['date_name'] = $row['date_name']; |
| 931 | 931 | $temp_array['date_count'] = $row['date_count']; |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | $datetime = new DateTime(); |
| 952 | 952 | $offset = $datetime->format('P'); |
| 953 | 953 | } else $offset = '+00:00'; |
| 954 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 954 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 955 | 955 | if ($globalDBdriver == 'mysql') { |
| 956 | 956 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 957 | 957 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -972,7 +972,7 @@ discard block |
||
| 972 | 972 | $date_array = array(); |
| 973 | 973 | $temp_array = array(); |
| 974 | 974 | |
| 975 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 975 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 976 | 976 | { |
| 977 | 977 | $temp_array['date_name'] = $row['date_name']; |
| 978 | 978 | $temp_array['date_count'] = $row['date_count']; |
@@ -997,7 +997,7 @@ discard block |
||
| 997 | 997 | $datetime = new DateTime(); |
| 998 | 998 | $offset = $datetime->format('P'); |
| 999 | 999 | } else $offset = '+00:00'; |
| 1000 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1000 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1001 | 1001 | if ($globalDBdriver == 'mysql') { |
| 1002 | 1002 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1003 | 1003 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1018,7 +1018,7 @@ discard block |
||
| 1018 | 1018 | $date_array = array(); |
| 1019 | 1019 | $temp_array = array(); |
| 1020 | 1020 | |
| 1021 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1021 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1022 | 1022 | { |
| 1023 | 1023 | $temp_array['date_name'] = $row['date_name']; |
| 1024 | 1024 | $temp_array['date_count'] = $row['date_count']; |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | $date_array = array(); |
| 1066 | 1066 | $temp_array = array(); |
| 1067 | 1067 | |
| 1068 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1068 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1069 | 1069 | { |
| 1070 | 1070 | $temp_array['month_name'] = $row['month_name']; |
| 1071 | 1071 | $temp_array['year_name'] = $row['year_name']; |
@@ -1094,7 +1094,7 @@ discard block |
||
| 1094 | 1094 | $datetime = new DateTime(); |
| 1095 | 1095 | $offset = $datetime->format('P'); |
| 1096 | 1096 | } else $offset = '+00:00'; |
| 1097 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1097 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1098 | 1098 | if ($globalDBdriver == 'mysql') { |
| 1099 | 1099 | $query = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 1100 | 1100 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1115,7 +1115,7 @@ discard block |
||
| 1115 | 1115 | $date_array = array(); |
| 1116 | 1116 | $temp_array = array(); |
| 1117 | 1117 | |
| 1118 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1118 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1119 | 1119 | { |
| 1120 | 1120 | $temp_array['year_name'] = $row['year_name']; |
| 1121 | 1121 | $temp_array['month_name'] = $row['month_name']; |
@@ -1135,7 +1135,7 @@ discard block |
||
| 1135 | 1135 | * @return Array the hour list |
| 1136 | 1136 | * |
| 1137 | 1137 | */ |
| 1138 | - public function countAllHours($orderby,$filters = array()) |
|
| 1138 | + public function countAllHours($orderby, $filters = array()) |
|
| 1139 | 1139 | { |
| 1140 | 1140 | global $globalTimezone, $globalDBdriver; |
| 1141 | 1141 | if ($globalTimezone != '') { |
@@ -1183,7 +1183,7 @@ discard block |
||
| 1183 | 1183 | $hour_array = array(); |
| 1184 | 1184 | $temp_array = array(); |
| 1185 | 1185 | |
| 1186 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1186 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1187 | 1187 | { |
| 1188 | 1188 | $temp_array['hour_name'] = $row['hour_name']; |
| 1189 | 1189 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1205,8 +1205,8 @@ discard block |
||
| 1205 | 1205 | public function countAllHoursByDate($date, $filters = array()) |
| 1206 | 1206 | { |
| 1207 | 1207 | global $globalTimezone, $globalDBdriver; |
| 1208 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1209 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 1208 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1209 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 1210 | 1210 | if ($globalTimezone != '') { |
| 1211 | 1211 | date_default_timezone_set($globalTimezone); |
| 1212 | 1212 | $datetime = new DateTime($date); |
@@ -1214,12 +1214,12 @@ discard block |
||
| 1214 | 1214 | } else $offset = '+00:00'; |
| 1215 | 1215 | |
| 1216 | 1216 | if ($globalDBdriver == 'mysql') { |
| 1217 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1217 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1218 | 1218 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date |
| 1219 | 1219 | GROUP BY hour_name |
| 1220 | 1220 | ORDER BY hour_name ASC"; |
| 1221 | 1221 | } else { |
| 1222 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1222 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1223 | 1223 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 1224 | 1224 | GROUP BY hour_name |
| 1225 | 1225 | ORDER BY hour_name ASC"; |
@@ -1231,7 +1231,7 @@ discard block |
||
| 1231 | 1231 | $hour_array = array(); |
| 1232 | 1232 | $temp_array = array(); |
| 1233 | 1233 | |
| 1234 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1234 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1235 | 1235 | { |
| 1236 | 1236 | $temp_array['hour_name'] = $row['hour_name']; |
| 1237 | 1237 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1253,8 +1253,8 @@ discard block |
||
| 1253 | 1253 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1254 | 1254 | { |
| 1255 | 1255 | global $globalTimezone, $globalDBdriver; |
| 1256 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1257 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1256 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1257 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1258 | 1258 | if ($globalTimezone != '') { |
| 1259 | 1259 | date_default_timezone_set($globalTimezone); |
| 1260 | 1260 | $datetime = new DateTime(); |
@@ -1262,12 +1262,12 @@ discard block |
||
| 1262 | 1262 | } else $offset = '+00:00'; |
| 1263 | 1263 | |
| 1264 | 1264 | if ($globalDBdriver == 'mysql') { |
| 1265 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1265 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1266 | 1266 | FROM marine_output".$filter_query." marine_output.ident = :ident |
| 1267 | 1267 | GROUP BY hour_name |
| 1268 | 1268 | ORDER BY hour_name ASC"; |
| 1269 | 1269 | } else { |
| 1270 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1270 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1271 | 1271 | FROM marine_output".$filter_query." marine_output.ident = :ident |
| 1272 | 1272 | GROUP BY hour_name |
| 1273 | 1273 | ORDER BY hour_name ASC"; |
@@ -1275,12 +1275,12 @@ discard block |
||
| 1275 | 1275 | |
| 1276 | 1276 | |
| 1277 | 1277 | $sth = $this->db->prepare($query); |
| 1278 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 1278 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 1279 | 1279 | |
| 1280 | 1280 | $hour_array = array(); |
| 1281 | 1281 | $temp_array = array(); |
| 1282 | 1282 | |
| 1283 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1283 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1284 | 1284 | { |
| 1285 | 1285 | $temp_array['hour_name'] = $row['hour_name']; |
| 1286 | 1286 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1299,32 +1299,32 @@ discard block |
||
| 1299 | 1299 | * @return Integer the number of flights |
| 1300 | 1300 | * |
| 1301 | 1301 | */ |
| 1302 | - public function countOverallTracked($filters = array(),$year = '',$month = '') |
|
| 1302 | + public function countOverallTracked($filters = array(), $year = '', $month = '') |
|
| 1303 | 1303 | { |
| 1304 | 1304 | global $globalDBdriver; |
| 1305 | - $queryi = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output"; |
|
| 1305 | + $queryi = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output"; |
|
| 1306 | 1306 | $query_values = array(); |
| 1307 | 1307 | $query = ''; |
| 1308 | 1308 | if ($year != '') { |
| 1309 | 1309 | if ($globalDBdriver == 'mysql') { |
| 1310 | 1310 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 1311 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1311 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1312 | 1312 | } else { |
| 1313 | 1313 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 1314 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1314 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1315 | 1315 | } |
| 1316 | 1316 | } |
| 1317 | 1317 | if ($month != '') { |
| 1318 | 1318 | if ($globalDBdriver == 'mysql') { |
| 1319 | 1319 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 1320 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1320 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1321 | 1321 | } else { |
| 1322 | 1322 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 1323 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1323 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1324 | 1324 | } |
| 1325 | 1325 | } |
| 1326 | 1326 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1327 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1327 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1328 | 1328 | |
| 1329 | 1329 | $sth = $this->db->prepare($queryi); |
| 1330 | 1330 | $sth->execute($query_values); |
@@ -1341,7 +1341,7 @@ discard block |
||
| 1341 | 1341 | public function countAllHoursFromToday($filters = array()) |
| 1342 | 1342 | { |
| 1343 | 1343 | global $globalTimezone, $globalDBdriver; |
| 1344 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1344 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1345 | 1345 | if ($globalTimezone != '') { |
| 1346 | 1346 | date_default_timezone_set($globalTimezone); |
| 1347 | 1347 | $datetime = new DateTime(); |
@@ -1349,12 +1349,12 @@ discard block |
||
| 1349 | 1349 | } else $offset = '+00:00'; |
| 1350 | 1350 | |
| 1351 | 1351 | if ($globalDBdriver == 'mysql') { |
| 1352 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1352 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1353 | 1353 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE() |
| 1354 | 1354 | GROUP BY hour_name |
| 1355 | 1355 | ORDER BY hour_name ASC"; |
| 1356 | 1356 | } else { |
| 1357 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1357 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1358 | 1358 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 1359 | 1359 | GROUP BY hour_name |
| 1360 | 1360 | ORDER BY hour_name ASC"; |
@@ -1366,7 +1366,7 @@ discard block |
||
| 1366 | 1366 | $hour_array = array(); |
| 1367 | 1367 | $temp_array = array(); |
| 1368 | 1368 | |
| 1369 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1369 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1370 | 1370 | { |
| 1371 | 1371 | $temp_array['hour_name'] = $row['hour_name']; |
| 1372 | 1372 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1385,9 +1385,9 @@ discard block |
||
| 1385 | 1385 | */ |
| 1386 | 1386 | public function getMarineIDBasedOnFamMarineID($fammarine_id) |
| 1387 | 1387 | { |
| 1388 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 1388 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 1389 | 1389 | |
| 1390 | - $query = "SELECT marine_output.marine_id |
|
| 1390 | + $query = "SELECT marine_output.marine_id |
|
| 1391 | 1391 | FROM marine_output |
| 1392 | 1392 | WHERE marine_output.fammarine_id = '".$fammarine_id."'"; |
| 1393 | 1393 | |
@@ -1395,7 +1395,7 @@ discard block |
||
| 1395 | 1395 | $sth = $this->db->prepare($query); |
| 1396 | 1396 | $sth->execute(); |
| 1397 | 1397 | |
| 1398 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1398 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1399 | 1399 | { |
| 1400 | 1400 | return $row['marine_id']; |
| 1401 | 1401 | } |
@@ -1420,23 +1420,23 @@ discard block |
||
| 1420 | 1420 | } |
| 1421 | 1421 | |
| 1422 | 1422 | $current_date = date("Y-m-d H:i:s"); |
| 1423 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 1423 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 1424 | 1424 | |
| 1425 | 1425 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 1426 | 1426 | |
| 1427 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 1427 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 1428 | 1428 | $years = $time_array['years']; |
| 1429 | 1429 | |
| 1430 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 1430 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 1431 | 1431 | $months = $time_array['months']; |
| 1432 | 1432 | |
| 1433 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 1433 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 1434 | 1434 | $days = $time_array['days']; |
| 1435 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 1435 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 1436 | 1436 | $hours = $time_array['hours']; |
| 1437 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 1437 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 1438 | 1438 | $minutes = $time_array['minutes']; |
| 1439 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1439 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1440 | 1440 | |
| 1441 | 1441 | return $time_array; |
| 1442 | 1442 | } |
@@ -1459,63 +1459,63 @@ discard block |
||
| 1459 | 1459 | $temp_array['direction_degree'] = $direction; |
| 1460 | 1460 | $temp_array['direction_shortname'] = "N"; |
| 1461 | 1461 | $temp_array['direction_fullname'] = "North"; |
| 1462 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 1462 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 1463 | 1463 | $temp_array['direction_degree'] = $direction; |
| 1464 | 1464 | $temp_array['direction_shortname'] = "NNE"; |
| 1465 | 1465 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 1466 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 1466 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 1467 | 1467 | $temp_array['direction_degree'] = $direction; |
| 1468 | 1468 | $temp_array['direction_shortname'] = "NE"; |
| 1469 | 1469 | $temp_array['direction_fullname'] = "Northeast"; |
| 1470 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 1470 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 1471 | 1471 | $temp_array['direction_degree'] = $direction; |
| 1472 | 1472 | $temp_array['direction_shortname'] = "ENE"; |
| 1473 | 1473 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 1474 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 1474 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 1475 | 1475 | $temp_array['direction_degree'] = $direction; |
| 1476 | 1476 | $temp_array['direction_shortname'] = "E"; |
| 1477 | 1477 | $temp_array['direction_fullname'] = "East"; |
| 1478 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 1478 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 1479 | 1479 | $temp_array['direction_degree'] = $direction; |
| 1480 | 1480 | $temp_array['direction_shortname'] = "ESE"; |
| 1481 | 1481 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 1482 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 1482 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 1483 | 1483 | $temp_array['direction_degree'] = $direction; |
| 1484 | 1484 | $temp_array['direction_shortname'] = "SE"; |
| 1485 | 1485 | $temp_array['direction_fullname'] = "Southeast"; |
| 1486 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 1486 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 1487 | 1487 | $temp_array['direction_degree'] = $direction; |
| 1488 | 1488 | $temp_array['direction_shortname'] = "SSE"; |
| 1489 | 1489 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 1490 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 1490 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 1491 | 1491 | $temp_array['direction_degree'] = $direction; |
| 1492 | 1492 | $temp_array['direction_shortname'] = "S"; |
| 1493 | 1493 | $temp_array['direction_fullname'] = "South"; |
| 1494 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 1494 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 1495 | 1495 | $temp_array['direction_degree'] = $direction; |
| 1496 | 1496 | $temp_array['direction_shortname'] = "SSW"; |
| 1497 | 1497 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 1498 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 1498 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 1499 | 1499 | $temp_array['direction_degree'] = $direction; |
| 1500 | 1500 | $temp_array['direction_shortname'] = "SW"; |
| 1501 | 1501 | $temp_array['direction_fullname'] = "Southwest"; |
| 1502 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 1502 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 1503 | 1503 | $temp_array['direction_degree'] = $direction; |
| 1504 | 1504 | $temp_array['direction_shortname'] = "WSW"; |
| 1505 | 1505 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 1506 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 1506 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 1507 | 1507 | $temp_array['direction_degree'] = $direction; |
| 1508 | 1508 | $temp_array['direction_shortname'] = "W"; |
| 1509 | 1509 | $temp_array['direction_fullname'] = "West"; |
| 1510 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 1510 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 1511 | 1511 | $temp_array['direction_degree'] = $direction; |
| 1512 | 1512 | $temp_array['direction_shortname'] = "WNW"; |
| 1513 | 1513 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 1514 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 1514 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 1515 | 1515 | $temp_array['direction_degree'] = $direction; |
| 1516 | 1516 | $temp_array['direction_shortname'] = "NW"; |
| 1517 | 1517 | $temp_array['direction_fullname'] = "Northwest"; |
| 1518 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 1518 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 1519 | 1519 | $temp_array['direction_degree'] = $direction; |
| 1520 | 1520 | $temp_array['direction_shortname'] = "NNW"; |
| 1521 | 1521 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -1532,11 +1532,11 @@ discard block |
||
| 1532 | 1532 | * @param Float $longitude longitute of the flight |
| 1533 | 1533 | * @return String the countrie |
| 1534 | 1534 | */ |
| 1535 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 1535 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 1536 | 1536 | { |
| 1537 | 1537 | global $globalDBdriver, $globalDebug; |
| 1538 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1539 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1538 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1539 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1540 | 1540 | |
| 1541 | 1541 | $Connection = new Connection($this->db); |
| 1542 | 1542 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1576,7 +1576,7 @@ discard block |
||
| 1576 | 1576 | public function getCountryFromISO2($iso2) |
| 1577 | 1577 | { |
| 1578 | 1578 | global $globalDBdriver, $globalDebug; |
| 1579 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 1579 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 1580 | 1580 | |
| 1581 | 1581 | $Connection = new Connection($this->db); |
| 1582 | 1582 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1624,7 +1624,7 @@ discard block |
||
| 1624 | 1624 | |
| 1625 | 1625 | $bitly_data = json_decode($bitly_data); |
| 1626 | 1626 | $bitly_url = ''; |
| 1627 | - if ($bitly_data->status_txt = "OK"){ |
|
| 1627 | + if ($bitly_data->status_txt = "OK") { |
|
| 1628 | 1628 | $bitly_url = $bitly_data->data->url; |
| 1629 | 1629 | } |
| 1630 | 1630 | |
@@ -1634,7 +1634,7 @@ discard block |
||
| 1634 | 1634 | |
| 1635 | 1635 | public function getOrderBy() |
| 1636 | 1636 | { |
| 1637 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 1637 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 1638 | 1638 | |
| 1639 | 1639 | return $orderby; |
| 1640 | 1640 | |
@@ -16,62 +16,62 @@ discard block |
||
| 16 | 16 | * @param Array $filter the filter |
| 17 | 17 | * @return Array the SQL part |
| 18 | 18 | */ |
| 19 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
| 22 | 22 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 23 | 23 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 24 | 24 | $filters = $globalStatsFilters[$globalFilterName]; |
| 25 | 25 | } else { |
| 26 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 26 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | - $filters = array_merge($filters,$filter); |
|
| 30 | + $filters = array_merge($filters, $filter); |
|
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 33 | 33 | $filter_query_join = ''; |
| 34 | 34 | $filter_query_where = ''; |
| 35 | - foreach($filters as $flt) { |
|
| 35 | + foreach ($filters as $flt) { |
|
| 36 | 36 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 37 | 37 | if ($flt['airlines'][0] != '') { |
| 38 | 38 | if (isset($flt['source'])) { |
| 39 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 39 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 40 | 40 | } else { |
| 41 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 41 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 46 | 46 | if (isset($flt['source'])) { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 48 | 48 | } else { |
| 49 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 49 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 53 | 53 | if (isset($flt['source'])) { |
| 54 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 54 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 55 | 55 | } else { |
| 56 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 56 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 60 | 60 | if (isset($flt['source'])) { |
| 61 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 61 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 62 | 62 | } else { |
| 63 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 63 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 67 | 67 | if (isset($flt['source'])) { |
| 68 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 68 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 73 | 73 | if ($filter['airlines'][0] != '') { |
| 74 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 74 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | if (isset($filter['alliance']) && !empty($filter['alliance'])) { |
@@ -81,10 +81,10 @@ discard block |
||
| 81 | 81 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
| 82 | 82 | } |
| 83 | 83 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 84 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 84 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 85 | 85 | } |
| 86 | 86 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 87 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 87 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 88 | 88 | } |
| 89 | 89 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 90 | 90 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -113,15 +113,15 @@ discard block |
||
| 113 | 113 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'"; |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 116 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 117 | 117 | } |
| 118 | 118 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 119 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 119 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 120 | 120 | } |
| 121 | 121 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 122 | 122 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 123 | 123 | if ($filter_query_where != '') { |
| 124 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 124 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 125 | 125 | } |
| 126 | 126 | $filter_query = $filter_query_join.$filter_query_where; |
| 127 | 127 | return $filter_query; |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | if ($limit != '') |
| 145 | 145 | { |
| 146 | 146 | $limit_array = explode(',', $limit); |
| 147 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 147 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 149 | 149 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 150 | 150 | { |
| 151 | 151 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | } else { |
| 169 | 169 | $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; |
| 170 | 170 | } |
| 171 | - $spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 171 | + $spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 172 | 172 | |
| 173 | 173 | return $spotter_array; |
| 174 | 174 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | global $globalDBdriver, $globalLiveInterval; |
| 185 | 185 | date_default_timezone_set('UTC'); |
| 186 | 186 | |
| 187 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 187 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 188 | 188 | |
| 189 | 189 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 190 | 190 | if ($globalDBdriver == 'mysql') { |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | $query = 'SELECT a.aircraft_shadow, 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 |
| 196 | 196 | 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 LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0"; |
| 197 | 197 | */ |
| 198 | - $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 |
|
| 198 | + $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 |
|
| 199 | 199 | FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0"; |
| 200 | 200 | |
| 201 | 201 | // $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 FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date ORDER BY spotter_live.date GROUP BY spotter_live.flightaware_id'.$filter_query; |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | 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 LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 211 | 211 | */ |
| 212 | 212 | |
| 213 | - $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 |
|
| 213 | + $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 |
|
| 214 | 214 | 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." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 215 | 215 | |
| 216 | 216 | |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | try { |
| 222 | 222 | $sth = $this->db->prepare($query); |
| 223 | 223 | $sth->execute(); |
| 224 | - } catch(PDOException $e) { |
|
| 224 | + } catch (PDOException $e) { |
|
| 225 | 225 | echo $e->getMessage(); |
| 226 | 226 | die; |
| 227 | 227 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | global $globalDBdriver, $globalLiveInterval; |
| 242 | 242 | date_default_timezone_set('UTC'); |
| 243 | 243 | |
| 244 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 244 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 245 | 245 | |
| 246 | 246 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 247 | 247 | if ($globalDBdriver == 'mysql') { |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 251 | 251 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 252 | 252 | */ |
| 253 | - $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 |
|
| 253 | + $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 |
|
| 254 | 254 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 255 | 255 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 256 | 256 | } else { |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category, icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 260 | 260 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 261 | 261 | */ |
| 262 | - $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 |
|
| 262 | + $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 |
|
| 263 | 263 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 264 | 264 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 265 | 265 | // echo $query; |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | try { |
| 269 | 269 | $sth = $this->db->prepare($query); |
| 270 | 270 | $sth->execute(); |
| 271 | - } catch(PDOException $e) { |
|
| 271 | + } catch (PDOException $e) { |
|
| 272 | 272 | echo $e->getMessage(); |
| 273 | 273 | die; |
| 274 | 274 | } |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | public function getLiveSpotterCount($filter = array()) |
| 286 | 286 | { |
| 287 | 287 | global $globalDBdriver, $globalLiveInterval; |
| 288 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 288 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 289 | 289 | |
| 290 | 290 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 291 | 291 | if ($globalDBdriver == 'mysql') { |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | try { |
| 299 | 299 | $sth = $this->db->prepare($query); |
| 300 | 300 | $sth->execute(); |
| 301 | - } catch(PDOException $e) { |
|
| 301 | + } catch (PDOException $e) { |
|
| 302 | 302 | echo $e->getMessage(); |
| 303 | 303 | die; |
| 304 | 304 | } |
@@ -321,10 +321,10 @@ discard block |
||
| 321 | 321 | $filter_query = $this->getFilter($filter); |
| 322 | 322 | |
| 323 | 323 | if (is_array($coord)) { |
| 324 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 325 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 326 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 327 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 324 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 325 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 326 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 327 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 328 | 328 | } else return array(); |
| 329 | 329 | if ($globalDBdriver == 'mysql') { |
| 330 | 330 | //$query = "SELECT spotter_output.* FROM spotter_output WHERE spotter_output.flightaware_id IN (SELECT spotter_live.flightaware_id 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.")"; |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | if ($interval == '1m') |
| 378 | 378 | { |
| 379 | 379 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 380 | - } else if ($interval == '15m'){ |
|
| 380 | + } else if ($interval == '15m') { |
|
| 381 | 381 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
| 382 | 382 | } |
| 383 | 383 | } |
@@ -385,14 +385,14 @@ discard block |
||
| 385 | 385 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - $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 |
|
| 388 | + $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 |
|
| 389 | 389 | WHERE spotter_live.latitude <> '' |
| 390 | 390 | AND spotter_live.longitude <> '' |
| 391 | 391 | ".$additional_query." |
| 392 | 392 | HAVING distance < :radius |
| 393 | 393 | ORDER BY distance"; |
| 394 | 394 | |
| 395 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 395 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 396 | 396 | |
| 397 | 397 | return $spotter_array; |
| 398 | 398 | } |
@@ -410,9 +410,9 @@ discard block |
||
| 410 | 410 | date_default_timezone_set('UTC'); |
| 411 | 411 | |
| 412 | 412 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 413 | - $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'; |
|
| 413 | + $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'; |
|
| 414 | 414 | |
| 415 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 415 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 416 | 416 | |
| 417 | 417 | return $spotter_array; |
| 418 | 418 | } |
@@ -423,16 +423,16 @@ discard block |
||
| 423 | 423 | * @return Array the spotter information |
| 424 | 424 | * |
| 425 | 425 | */ |
| 426 | - public function getDateLiveSpotterDataByIdent($ident,$date) |
|
| 426 | + public function getDateLiveSpotterDataByIdent($ident, $date) |
|
| 427 | 427 | { |
| 428 | 428 | $Spotter = new Spotter($this->db); |
| 429 | 429 | date_default_timezone_set('UTC'); |
| 430 | 430 | |
| 431 | 431 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 432 | - $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'; |
|
| 432 | + $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'; |
|
| 433 | 433 | |
| 434 | - $date = date('c',$date); |
|
| 435 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 434 | + $date = date('c', $date); |
|
| 435 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 436 | 436 | |
| 437 | 437 | return $spotter_array; |
| 438 | 438 | } |
@@ -449,9 +449,9 @@ discard block |
||
| 449 | 449 | date_default_timezone_set('UTC'); |
| 450 | 450 | |
| 451 | 451 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 452 | - $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'; |
|
| 452 | + $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'; |
|
| 453 | 453 | |
| 454 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 454 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 455 | 455 | |
| 456 | 456 | return $spotter_array; |
| 457 | 457 | } |
@@ -462,15 +462,15 @@ discard block |
||
| 462 | 462 | * @return Array the spotter information |
| 463 | 463 | * |
| 464 | 464 | */ |
| 465 | - public function getDateLiveSpotterDataById($id,$date) |
|
| 465 | + public function getDateLiveSpotterDataById($id, $date) |
|
| 466 | 466 | { |
| 467 | 467 | $Spotter = new Spotter($this->db); |
| 468 | 468 | date_default_timezone_set('UTC'); |
| 469 | 469 | |
| 470 | 470 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 471 | - $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'; |
|
| 472 | - $date = date('c',$date); |
|
| 473 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 471 | + $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'; |
|
| 472 | + $date = date('c', $date); |
|
| 473 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 474 | 474 | |
| 475 | 475 | return $spotter_array; |
| 476 | 476 | } |
@@ -487,13 +487,13 @@ discard block |
||
| 487 | 487 | date_default_timezone_set('UTC'); |
| 488 | 488 | |
| 489 | 489 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 490 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 490 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 491 | 491 | |
| 492 | 492 | try { |
| 493 | 493 | |
| 494 | 494 | $sth = $this->db->prepare($query); |
| 495 | 495 | $sth->execute(array(':ident' => $ident)); |
| 496 | - } catch(PDOException $e) { |
|
| 496 | + } catch (PDOException $e) { |
|
| 497 | 497 | echo $e->getMessage(); |
| 498 | 498 | die; |
| 499 | 499 | } |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | * @return Array the spotter information |
| 509 | 509 | * |
| 510 | 510 | */ |
| 511 | - public function getAllLiveSpotterDataById($id,$liveinterval = false) |
|
| 511 | + public function getAllLiveSpotterDataById($id, $liveinterval = false) |
|
| 512 | 512 | { |
| 513 | 513 | global $globalDBdriver, $globalLiveInterval; |
| 514 | 514 | date_default_timezone_set('UTC'); |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | try { |
| 528 | 528 | $sth = $this->db->prepare($query); |
| 529 | 529 | $sth->execute(array(':id' => $id)); |
| 530 | - } catch(PDOException $e) { |
|
| 530 | + } catch (PDOException $e) { |
|
| 531 | 531 | echo $e->getMessage(); |
| 532 | 532 | die; |
| 533 | 533 | } |
@@ -545,12 +545,12 @@ discard block |
||
| 545 | 545 | { |
| 546 | 546 | date_default_timezone_set('UTC'); |
| 547 | 547 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 548 | - $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 548 | + $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 549 | 549 | try { |
| 550 | 550 | |
| 551 | 551 | $sth = $this->db->prepare($query); |
| 552 | 552 | $sth->execute(array(':ident' => $ident)); |
| 553 | - } catch(PDOException $e) { |
|
| 553 | + } catch (PDOException $e) { |
|
| 554 | 554 | echo $e->getMessage(); |
| 555 | 555 | die; |
| 556 | 556 | } |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | |
| 581 | 581 | $sth = $this->db->prepare($query); |
| 582 | 582 | $sth->execute(); |
| 583 | - } catch(PDOException $e) { |
|
| 583 | + } catch (PDOException $e) { |
|
| 584 | 584 | return "error"; |
| 585 | 585 | } |
| 586 | 586 | |
@@ -603,14 +603,14 @@ discard block |
||
| 603 | 603 | |
| 604 | 604 | $sth = $this->db->prepare($query); |
| 605 | 605 | $sth->execute(); |
| 606 | - } catch(PDOException $e) { |
|
| 606 | + } catch (PDOException $e) { |
|
| 607 | 607 | return "error"; |
| 608 | 608 | } |
| 609 | 609 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 610 | 610 | $i = 0; |
| 611 | - $j =0; |
|
| 611 | + $j = 0; |
|
| 612 | 612 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 613 | - foreach($all as $row) |
|
| 613 | + foreach ($all as $row) |
|
| 614 | 614 | { |
| 615 | 615 | $i++; |
| 616 | 616 | $j++; |
@@ -618,9 +618,9 @@ discard block |
||
| 618 | 618 | if ($globalDebug) echo "."; |
| 619 | 619 | try { |
| 620 | 620 | |
| 621 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 621 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 622 | 622 | $sth->execute(); |
| 623 | - } catch(PDOException $e) { |
|
| 623 | + } catch (PDOException $e) { |
|
| 624 | 624 | return "error"; |
| 625 | 625 | } |
| 626 | 626 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
@@ -631,9 +631,9 @@ discard block |
||
| 631 | 631 | if ($i > 0) { |
| 632 | 632 | try { |
| 633 | 633 | |
| 634 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 634 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 635 | 635 | $sth->execute(); |
| 636 | - } catch(PDOException $e) { |
|
| 636 | + } catch (PDOException $e) { |
|
| 637 | 637 | return "error"; |
| 638 | 638 | } |
| 639 | 639 | } |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | |
| 647 | 647 | $sth = $this->db->prepare($query); |
| 648 | 648 | $sth->execute(); |
| 649 | - } catch(PDOException $e) { |
|
| 649 | + } catch (PDOException $e) { |
|
| 650 | 650 | return "error"; |
| 651 | 651 | } |
| 652 | 652 | /* $query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN ("; |
@@ -694,13 +694,13 @@ discard block |
||
| 694 | 694 | public function deleteLiveSpotterDataByIdent($ident) |
| 695 | 695 | { |
| 696 | 696 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 697 | - $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 697 | + $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 698 | 698 | |
| 699 | 699 | try { |
| 700 | 700 | |
| 701 | 701 | $sth = $this->db->prepare($query); |
| 702 | 702 | $sth->execute(array(':ident' => $ident)); |
| 703 | - } catch(PDOException $e) { |
|
| 703 | + } catch (PDOException $e) { |
|
| 704 | 704 | return "error"; |
| 705 | 705 | } |
| 706 | 706 | |
@@ -716,13 +716,13 @@ discard block |
||
| 716 | 716 | public function deleteLiveSpotterDataById($id) |
| 717 | 717 | { |
| 718 | 718 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 719 | - $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 719 | + $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 720 | 720 | |
| 721 | 721 | try { |
| 722 | 722 | |
| 723 | 723 | $sth = $this->db->prepare($query); |
| 724 | 724 | $sth->execute(array(':id' => $id)); |
| 725 | - } catch(PDOException $e) { |
|
| 725 | + } catch (PDOException $e) { |
|
| 726 | 726 | return "error"; |
| 727 | 727 | } |
| 728 | 728 | |
@@ -740,13 +740,13 @@ discard block |
||
| 740 | 740 | { |
| 741 | 741 | global $globalDBdriver, $globalTimezone; |
| 742 | 742 | if ($globalDBdriver == 'mysql') { |
| 743 | - $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 743 | + $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 744 | 744 | WHERE spotter_live.ident = :ident |
| 745 | 745 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 746 | 746 | AND spotter_live.date < UTC_TIMESTAMP()'; |
| 747 | 747 | $query_data = array(':ident' => $ident); |
| 748 | 748 | } else { |
| 749 | - $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 749 | + $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 750 | 750 | WHERE spotter_live.ident = :ident |
| 751 | 751 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 752 | 752 | AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -755,8 +755,8 @@ discard block |
||
| 755 | 755 | |
| 756 | 756 | $sth = $this->db->prepare($query); |
| 757 | 757 | $sth->execute($query_data); |
| 758 | - $ident_result=''; |
|
| 759 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 758 | + $ident_result = ''; |
|
| 759 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 760 | 760 | { |
| 761 | 761 | $ident_result = $row['ident']; |
| 762 | 762 | } |
@@ -773,13 +773,13 @@ discard block |
||
| 773 | 773 | { |
| 774 | 774 | global $globalDBdriver, $globalTimezone; |
| 775 | 775 | if ($globalDBdriver == 'mysql') { |
| 776 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 776 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 777 | 777 | WHERE spotter_live.ident = :ident |
| 778 | 778 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 779 | 779 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 780 | 780 | $query_data = array(':ident' => $ident); |
| 781 | 781 | } else { |
| 782 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 782 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 783 | 783 | WHERE spotter_live.ident = :ident |
| 784 | 784 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 785 | 785 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -788,8 +788,8 @@ discard block |
||
| 788 | 788 | |
| 789 | 789 | $sth = $this->db->prepare($query); |
| 790 | 790 | $sth->execute($query_data); |
| 791 | - $ident_result=''; |
|
| 792 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 791 | + $ident_result = ''; |
|
| 792 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 793 | 793 | { |
| 794 | 794 | $ident_result = $row['flightaware_id']; |
| 795 | 795 | } |
@@ -806,13 +806,13 @@ discard block |
||
| 806 | 806 | { |
| 807 | 807 | global $globalDBdriver, $globalTimezone; |
| 808 | 808 | if ($globalDBdriver == 'mysql') { |
| 809 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 809 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 810 | 810 | WHERE spotter_live.flightaware_id = :id |
| 811 | 811 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 812 | 812 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 813 | 813 | $query_data = array(':id' => $id); |
| 814 | 814 | } else { |
| 815 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 815 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 816 | 816 | WHERE spotter_live.flightaware_id = :id |
| 817 | 817 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 818 | 818 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -821,8 +821,8 @@ discard block |
||
| 821 | 821 | |
| 822 | 822 | $sth = $this->db->prepare($query); |
| 823 | 823 | $sth->execute($query_data); |
| 824 | - $ident_result=''; |
|
| 825 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 824 | + $ident_result = ''; |
|
| 825 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 826 | 826 | { |
| 827 | 827 | $ident_result = $row['flightaware_id']; |
| 828 | 828 | } |
@@ -839,13 +839,13 @@ discard block |
||
| 839 | 839 | { |
| 840 | 840 | global $globalDBdriver, $globalTimezone; |
| 841 | 841 | if ($globalDBdriver == 'mysql') { |
| 842 | - $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 842 | + $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 843 | 843 | WHERE spotter_live.ModeS = :modes |
| 844 | 844 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 845 | 845 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 846 | 846 | $query_data = array(':modes' => $modes); |
| 847 | 847 | } else { |
| 848 | - $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 848 | + $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 849 | 849 | WHERE spotter_live.ModeS = :modes |
| 850 | 850 | AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'"; |
| 851 | 851 | // // AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
@@ -854,8 +854,8 @@ discard block |
||
| 854 | 854 | |
| 855 | 855 | $sth = $this->db->prepare($query); |
| 856 | 856 | $sth->execute($query_data); |
| 857 | - $ident_result=''; |
|
| 858 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 857 | + $ident_result = ''; |
|
| 858 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 859 | 859 | { |
| 860 | 860 | //$ident_result = $row['spotter_live_id']; |
| 861 | 861 | $ident_result = $row['flightaware_id']; |
@@ -874,7 +874,7 @@ discard block |
||
| 874 | 874 | * @return String success or false |
| 875 | 875 | * |
| 876 | 876 | */ |
| 877 | - 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 = '') |
|
| 877 | + 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 = '') |
|
| 878 | 878 | { |
| 879 | 879 | global $globalURL, $globalArchive, $globalDebug; |
| 880 | 880 | $Common = new Common(); |
@@ -967,26 +967,26 @@ discard block |
||
| 967 | 967 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 968 | 968 | |
| 969 | 969 | |
| 970 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 971 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 972 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 973 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 974 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 975 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 976 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 977 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 978 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 979 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 980 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 981 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 982 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 983 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 984 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 985 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 986 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 987 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 988 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 989 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 970 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 971 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 972 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 973 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 974 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 975 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 976 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 977 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 978 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 979 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 980 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 981 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 982 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 983 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 984 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 985 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 986 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 987 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 988 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 989 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 990 | 990 | |
| 991 | 991 | $airline_name = ''; |
| 992 | 992 | $airline_icao = ''; |
@@ -1008,26 +1008,26 @@ discard block |
||
| 1008 | 1008 | $arrival_airport_country = ''; |
| 1009 | 1009 | |
| 1010 | 1010 | |
| 1011 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1012 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1013 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1014 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1011 | + if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL; |
|
| 1012 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL; |
|
| 1013 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 1014 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 1015 | 1015 | |
| 1016 | - $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) |
|
| 1016 | + $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) |
|
| 1017 | 1017 | 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)'; |
| 1018 | 1018 | |
| 1019 | - $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); |
|
| 1019 | + $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); |
|
| 1020 | 1020 | try { |
| 1021 | 1021 | |
| 1022 | 1022 | $sth = $this->db->prepare($query); |
| 1023 | 1023 | $sth->execute($query_values); |
| 1024 | - } catch(PDOException $e) { |
|
| 1024 | + } catch (PDOException $e) { |
|
| 1025 | 1025 | return "error : ".$e->getMessage(); |
| 1026 | 1026 | } |
| 1027 | 1027 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1028 | 1028 | if ($globalDebug) echo '(Add to SBS archive : '; |
| 1029 | 1029 | $SpotterArchive = new SpotterArchive($this->db); |
| 1030 | - $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, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1030 | + $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, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country); |
|
| 1031 | 1031 | if ($globalDebug) echo $result.')'; |
| 1032 | 1032 | } |
| 1033 | 1033 | return "success"; |
@@ -1036,7 +1036,7 @@ discard block |
||
| 1036 | 1036 | |
| 1037 | 1037 | public function getOrderBy() |
| 1038 | 1038 | { |
| 1039 | - $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")); |
|
| 1039 | + $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")); |
|
| 1040 | 1040 | return $orderby; |
| 1041 | 1041 | } |
| 1042 | 1042 | |
