@@ -4,8 +4,8 @@ discard block |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['aircraft_type'])) { |
| 7 | - header('Location: '.$globalURL.'/aircraft'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/aircraft'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING); |
@@ -64,14 +64,14 @@ discard block |
||
| 64 | 64 | function drawChart() { |
| 65 | 65 | var data = google.visualization.arrayToDataTable([ |
| 66 | 66 | ["'._("Hour").'", "'._("# of Flights").'"], '; |
| 67 | - $hour_data = ''; |
|
| 67 | + $hour_data = ''; |
|
| 68 | 68 | foreach($hour_array as $hour_item) |
| 69 | 69 | { |
| 70 | 70 | $hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],'; |
| 71 | 71 | } |
| 72 | 72 | $hour_data = substr($hour_data, 0, -1); |
| 73 | 73 | print $hour_data; |
| 74 | - print ']); |
|
| 74 | + print ']); |
|
| 75 | 75 | |
| 76 | 76 | var options = { |
| 77 | 77 | legend: {position: "none"}, |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['ident'])) { |
| 6 | - header('Location: '.$globalURL.'/ident'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/ident'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -11,13 +11,13 @@ discard block |
||
| 11 | 11 | $Connection = new Connection(); |
| 12 | 12 | |
| 13 | 13 | if (!$Connection->tableExists('airspace')) { |
| 14 | - die; |
|
| 14 | + die; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | if (isset($_GET['coord'])) |
| 18 | 18 | { |
| 19 | 19 | $coords = explode(',',$_GET['coord']); |
| 20 | - if ($globalDBdriver == 'mysql') { |
|
| 20 | + if ($globalDBdriver == 'mysql') { |
|
| 21 | 21 | $query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))"; |
| 22 | 22 | try { |
| 23 | 23 | $sth = $Connection->db->prepare($query); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | } else { |
| 40 | - if ($globalDBdriver == 'mysql') { |
|
| 40 | + if ($globalDBdriver == 'mysql') { |
|
| 41 | 41 | $query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace"; |
| 42 | 42 | } else { |
| 43 | 43 | $query = "SELECT *, ST_AsBinary(wkb_geometry,'NDR') AS wkb FROM airspace"; |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | $geojson = array( |
| 54 | - 'type' => 'FeatureCollection', |
|
| 55 | - 'features' => array() |
|
| 54 | + 'type' => 'FeatureCollection', |
|
| 55 | + 'features' => array() |
|
| 56 | 56 | ); |
| 57 | 57 | |
| 58 | 58 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
@@ -109,9 +109,9 @@ discard block |
||
| 109 | 109 | $properties['color'] = '#d9ffcb'; |
| 110 | 110 | } |
| 111 | 111 | $feature = array( |
| 112 | - 'type' => 'Feature', |
|
| 113 | - 'geometry' => json_decode($geom->out('json')), |
|
| 114 | - 'properties' => $properties |
|
| 112 | + 'type' => 'Feature', |
|
| 113 | + 'geometry' => json_decode($geom->out('json')), |
|
| 114 | + 'properties' => $properties |
|
| 115 | 115 | ); |
| 116 | 116 | array_push($geojson['features'], $feature); |
| 117 | 117 | } |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['country'])) { |
| 6 | - header('Location: '.$globalURL.'/country'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/country'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))); |
@@ -824,11 +824,11 @@ |
||
| 824 | 824 | } |
| 825 | 825 | |
| 826 | 826 | /** |
| 827 | - * Returns true if $string is valid UTF-8 and false otherwise. |
|
| 828 | - * |
|
| 829 | - * @param mixed $str String to be tested |
|
| 830 | - * @return boolean |
|
| 831 | - */ |
|
| 827 | + * Returns true if $string is valid UTF-8 and false otherwise. |
|
| 828 | + * |
|
| 829 | + * @param mixed $str String to be tested |
|
| 830 | + * @return boolean |
|
| 831 | + */ |
|
| 832 | 832 | static function is_utf8($str) |
| 833 | 833 | { |
| 834 | 834 | $c=0; $b=0; |
@@ -7,73 +7,73 @@ |
||
| 7 | 7 | public function __construct($dbc = null) { |
| 8 | 8 | $Connection = new Connection($dbc); |
| 9 | 9 | $this->db = $Connection->db; |
| 10 | - } |
|
| 11 | - public function getAllLocationInfo() { |
|
| 12 | - $query = "SELECT * FROM source_location"; |
|
| 13 | - $query_values = array(); |
|
| 14 | - try { |
|
| 15 | - $sth = $this->db->prepare($query); |
|
| 16 | - $sth->execute($query_values); |
|
| 17 | - } catch(PDOException $e) { |
|
| 18 | - return "error : ".$e->getMessage(); |
|
| 19 | - } |
|
| 20 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 21 | - return $all; |
|
| 22 | - } |
|
| 23 | - public function getLocationInfobyName($name) { |
|
| 24 | - $query = "SELECT * FROM source_location WHERE name = :name"; |
|
| 25 | - $query_values = array(':name' => $name); |
|
| 26 | - try { |
|
| 27 | - $sth = $this->db->prepare($query); |
|
| 28 | - $sth->execute($query_values); |
|
| 29 | - } catch(PDOException $e) { |
|
| 30 | - return "error : ".$e->getMessage(); |
|
| 31 | - } |
|
| 32 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 33 | - return $all; |
|
| 34 | - } |
|
| 35 | - public function getLocationInfobySourceName($name) { |
|
| 36 | - $query = "SELECT * FROM source_location WHERE source = :name"; |
|
| 37 | - $query_values = array(':name' => $name); |
|
| 38 | - try { |
|
| 39 | - $sth = $this->db->prepare($query); |
|
| 40 | - $sth->execute($query_values); |
|
| 41 | - } catch(PDOException $e) { |
|
| 42 | - return "error : ".$e->getMessage(); |
|
| 43 | - } |
|
| 44 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 45 | - return $all; |
|
| 46 | - } |
|
| 10 | + } |
|
| 11 | + public function getAllLocationInfo() { |
|
| 12 | + $query = "SELECT * FROM source_location"; |
|
| 13 | + $query_values = array(); |
|
| 14 | + try { |
|
| 15 | + $sth = $this->db->prepare($query); |
|
| 16 | + $sth->execute($query_values); |
|
| 17 | + } catch(PDOException $e) { |
|
| 18 | + return "error : ".$e->getMessage(); |
|
| 19 | + } |
|
| 20 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 21 | + return $all; |
|
| 22 | + } |
|
| 23 | + public function getLocationInfobyName($name) { |
|
| 24 | + $query = "SELECT * FROM source_location WHERE name = :name"; |
|
| 25 | + $query_values = array(':name' => $name); |
|
| 26 | + try { |
|
| 27 | + $sth = $this->db->prepare($query); |
|
| 28 | + $sth->execute($query_values); |
|
| 29 | + } catch(PDOException $e) { |
|
| 30 | + return "error : ".$e->getMessage(); |
|
| 31 | + } |
|
| 32 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 33 | + return $all; |
|
| 34 | + } |
|
| 35 | + public function getLocationInfobySourceName($name) { |
|
| 36 | + $query = "SELECT * FROM source_location WHERE source = :name"; |
|
| 37 | + $query_values = array(':name' => $name); |
|
| 38 | + try { |
|
| 39 | + $sth = $this->db->prepare($query); |
|
| 40 | + $sth->execute($query_values); |
|
| 41 | + } catch(PDOException $e) { |
|
| 42 | + return "error : ".$e->getMessage(); |
|
| 43 | + } |
|
| 44 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 45 | + return $all; |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') { |
|
| 49 | - $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)"; |
|
| 50 | - $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source); |
|
| 51 | - try { |
|
| 52 | - $sth = $this->db->prepare($query); |
|
| 53 | - $sth->execute($query_values); |
|
| 54 | - } catch(PDOException $e) { |
|
| 55 | - return "error : ".$e->getMessage(); |
|
| 56 | - } |
|
| 57 | - } |
|
| 48 | + public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') { |
|
| 49 | + $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)"; |
|
| 50 | + $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source); |
|
| 51 | + try { |
|
| 52 | + $sth = $this->db->prepare($query); |
|
| 53 | + $sth->execute($query_values); |
|
| 54 | + } catch(PDOException $e) { |
|
| 55 | + return "error : ".$e->getMessage(); |
|
| 56 | + } |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - public function deleteLocation($id) { |
|
| 60 | - $query = "DELETE FROM source_location WHERE id = :id"; |
|
| 61 | - $query_values = array(':id' => $id); |
|
| 62 | - try { |
|
| 63 | - $sth = $this->db->prepare($query); |
|
| 64 | - $sth->execute($query_values); |
|
| 65 | - } catch(PDOException $e) { |
|
| 66 | - return "error : ".$e->getMessage(); |
|
| 67 | - } |
|
| 68 | - } |
|
| 69 | - public function deleteAllLocation() { |
|
| 70 | - $query = "DELETE FROM source_location"; |
|
| 71 | - try { |
|
| 72 | - $sth = $this->db->prepare($query); |
|
| 73 | - $sth->execute(); |
|
| 74 | - } catch(PDOException $e) { |
|
| 75 | - return "error : ".$e->getMessage(); |
|
| 76 | - } |
|
| 77 | - } |
|
| 59 | + public function deleteLocation($id) { |
|
| 60 | + $query = "DELETE FROM source_location WHERE id = :id"; |
|
| 61 | + $query_values = array(':id' => $id); |
|
| 62 | + try { |
|
| 63 | + $sth = $this->db->prepare($query); |
|
| 64 | + $sth->execute($query_values); |
|
| 65 | + } catch(PDOException $e) { |
|
| 66 | + return "error : ".$e->getMessage(); |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | + public function deleteAllLocation() { |
|
| 70 | + $query = "DELETE FROM source_location"; |
|
| 71 | + try { |
|
| 72 | + $sth = $this->db->prepare($query); |
|
| 73 | + $sth->execute(); |
|
| 74 | + } catch(PDOException $e) { |
|
| 75 | + return "error : ".$e->getMessage(); |
|
| 76 | + } |
|
| 77 | + } |
|
| 78 | 78 | } |
| 79 | 79 | ?> |
| 80 | 80 | \ No newline at end of file |
@@ -12,11 +12,11 @@ discard block |
||
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | - * Gets the images based on the aircraft registration |
|
| 16 | - * |
|
| 17 | - * @return Array the images list |
|
| 18 | - * |
|
| 19 | - */ |
|
| 15 | + * Gets the images based on the aircraft registration |
|
| 16 | + * |
|
| 17 | + * @return Array the images list |
|
| 18 | + * |
|
| 19 | + */ |
|
| 20 | 20 | public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 21 | 21 | { |
| 22 | 22 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | WHERE spotter_image.registration = :registration"; |
| 30 | 30 | $sth = $this->db->prepare($query); |
| 31 | 31 | $sth->execute(array(':registration' => $registration)); |
| 32 | - /* |
|
| 32 | + /* |
|
| 33 | 33 | $images_array = array(); |
| 34 | 34 | $temp_array = array(); |
| 35 | 35 | |
@@ -52,11 +52,11 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | - * Gets the image copyright based on the Exif data |
|
| 56 | - * |
|
| 57 | - * @return String image copyright |
|
| 58 | - * |
|
| 59 | - */ |
|
| 55 | + * Gets the image copyright based on the Exif data |
|
| 56 | + * |
|
| 57 | + * @return String image copyright |
|
| 58 | + * |
|
| 59 | + */ |
|
| 60 | 60 | public function getExifCopyright($url) { |
| 61 | 61 | $exif = exif_read_data($url); |
| 62 | 62 | $copyright = ''; |
@@ -71,11 +71,11 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | /** |
| 74 | - * Adds the images based on the aircraft registration |
|
| 75 | - * |
|
| 76 | - * @return String either success or error |
|
| 77 | - * |
|
| 78 | - */ |
|
| 74 | + * Adds the images based on the aircraft registration |
|
| 75 | + * |
|
| 76 | + * @return String either success or error |
|
| 77 | + * |
|
| 78 | + */ |
|
| 79 | 79 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 80 | 80 | { |
| 81 | 81 | global $globalDebug,$globalAircraftImageFetch; |
@@ -104,12 +104,12 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
| 107 | - * Gets the aircraft image |
|
| 108 | - * |
|
| 109 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 110 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 111 | - * |
|
| 112 | - */ |
|
| 107 | + * Gets the aircraft image |
|
| 108 | + * |
|
| 109 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 110 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 111 | + * |
|
| 112 | + */ |
|
| 113 | 113 | public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '') |
| 114 | 114 | { |
| 115 | 115 | global $globalAircraftImageSources, $globalIVAO; |
@@ -149,13 +149,13 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
| 152 | - * Gets the aircraft image from Planespotters |
|
| 153 | - * |
|
| 154 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 155 | - * @param String $aircraft_name type of the aircraft |
|
| 156 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 157 | - * |
|
| 158 | - */ |
|
| 152 | + * Gets the aircraft image from Planespotters |
|
| 153 | + * |
|
| 154 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 155 | + * @param String $aircraft_name type of the aircraft |
|
| 156 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 157 | + * |
|
| 158 | + */ |
|
| 159 | 159 | public function fromPlanespotters($aircraft_registration, $aircraft_name='') { |
| 160 | 160 | $Common = new Common(); |
| 161 | 161 | // If aircraft registration is only number, also check with aircraft model |
@@ -182,13 +182,13 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
| 185 | - * Gets the aircraft image from Deviantart |
|
| 186 | - * |
|
| 187 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 188 | - * @param String $aircraft_name type of the aircraft |
|
| 189 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 190 | - * |
|
| 191 | - */ |
|
| 185 | + * Gets the aircraft image from Deviantart |
|
| 186 | + * |
|
| 187 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 188 | + * @param String $aircraft_name type of the aircraft |
|
| 189 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 190 | + * |
|
| 191 | + */ |
|
| 192 | 192 | public function fromDeviantart($aircraft_registration, $aircraft_name='') { |
| 193 | 193 | $Common = new Common(); |
| 194 | 194 | // If aircraft registration is only number, also check with aircraft model |
@@ -216,13 +216,13 @@ discard block |
||
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | /** |
| 219 | - * Gets the aircraft image from JetPhotos |
|
| 220 | - * |
|
| 221 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 222 | - * @param String $aircraft_name type of the aircraft |
|
| 223 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 224 | - * |
|
| 225 | - */ |
|
| 219 | + * Gets the aircraft image from JetPhotos |
|
| 220 | + * |
|
| 221 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 222 | + * @param String $aircraft_name type of the aircraft |
|
| 223 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 224 | + * |
|
| 225 | + */ |
|
| 226 | 226 | public function fromJetPhotos($aircraft_registration, $aircraft_name='') { |
| 227 | 227 | $Common = new Common(); |
| 228 | 228 | $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
@@ -258,13 +258,13 @@ discard block |
||
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | /** |
| 261 | - * Gets the aircraft image from PlanePictures |
|
| 262 | - * |
|
| 263 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 264 | - * @param String $aircraft_name type of the aircraft |
|
| 265 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 266 | - * |
|
| 267 | - */ |
|
| 261 | + * Gets the aircraft image from PlanePictures |
|
| 262 | + * |
|
| 263 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 264 | + * @param String $aircraft_name type of the aircraft |
|
| 265 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 266 | + * |
|
| 267 | + */ |
|
| 268 | 268 | public function fromPlanePictures($aircraft_registration, $aircraft_name='') { |
| 269 | 269 | $Common = new Common(); |
| 270 | 270 | $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
@@ -292,13 +292,13 @@ discard block |
||
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | /** |
| 295 | - * Gets the aircraft image from Flickr |
|
| 296 | - * |
|
| 297 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 298 | - * @param String $aircraft_name type of the aircraft |
|
| 299 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 300 | - * |
|
| 301 | - */ |
|
| 295 | + * Gets the aircraft image from Flickr |
|
| 296 | + * |
|
| 297 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 298 | + * @param String $aircraft_name type of the aircraft |
|
| 299 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 300 | + * |
|
| 301 | + */ |
|
| 302 | 302 | public function fromFlickr($aircraft_registration,$aircraft_name='') { |
| 303 | 303 | $Common = new Common(); |
| 304 | 304 | if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name); |
@@ -336,13 +336,13 @@ discard block |
||
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | /** |
| 339 | - * Gets the aircraft image from Bing |
|
| 340 | - * |
|
| 341 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 342 | - * @param String $aircraft_name type of the aircraft |
|
| 343 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 344 | - * |
|
| 345 | - */ |
|
| 339 | + * Gets the aircraft image from Bing |
|
| 340 | + * |
|
| 341 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 342 | + * @param String $aircraft_name type of the aircraft |
|
| 343 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 344 | + * |
|
| 345 | + */ |
|
| 346 | 346 | public function fromBing($aircraft_registration,$aircraft_name='') { |
| 347 | 347 | global $globalImageBingKey; |
| 348 | 348 | $Common = new Common(); |
@@ -368,13 +368,13 @@ discard block |
||
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | /** |
| 371 | - * Gets the aircraft image from airport-data |
|
| 372 | - * |
|
| 373 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 374 | - * @param String $aircraft_name type of the aircraft |
|
| 375 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 376 | - * |
|
| 377 | - */ |
|
| 371 | + * Gets the aircraft image from airport-data |
|
| 372 | + * |
|
| 373 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 374 | + * @param String $aircraft_name type of the aircraft |
|
| 375 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 376 | + * |
|
| 377 | + */ |
|
| 378 | 378 | public function fromAirportData($aircraft_registration,$aircraft_name='') { |
| 379 | 379 | $Common = new Common(); |
| 380 | 380 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
@@ -393,13 +393,13 @@ discard block |
||
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | /** |
| 396 | - * Gets the aircraft image from WikiMedia |
|
| 397 | - * |
|
| 398 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 399 | - * @param String $aircraft_name type of the aircraft |
|
| 400 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 401 | - * |
|
| 402 | - */ |
|
| 396 | + * Gets the aircraft image from WikiMedia |
|
| 397 | + * |
|
| 398 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 399 | + * @param String $aircraft_name type of the aircraft |
|
| 400 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 401 | + * |
|
| 402 | + */ |
|
| 403 | 403 | public function fromWikimedia($aircraft_registration,$aircraft_name='') { |
| 404 | 404 | $Common = new Common(); |
| 405 | 405 | if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name); |
@@ -449,13 +449,13 @@ discard block |
||
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | /** |
| 452 | - * Gets the aircraft image from custom url |
|
| 453 | - * |
|
| 454 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 455 | - * @param String $aircraft_name type of the aircraft |
|
| 456 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 457 | - * |
|
| 458 | - */ |
|
| 452 | + * Gets the aircraft image from custom url |
|
| 453 | + * |
|
| 454 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 455 | + * @param String $aircraft_name type of the aircraft |
|
| 456 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 457 | + * |
|
| 458 | + */ |
|
| 459 | 459 | public function fromCustomSource($aircraft_registration,$aircraft_name='') { |
| 460 | 460 | global $globalAircraftImageCustomSources, $globalDebug; |
| 461 | 461 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
@@ -4,8 +4,8 @@ discard block |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['airport'])) { |
| 7 | - header('Location: '.$globalURL.'/airport'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/airport'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
| 11 | 11 | $Spotter = new Spotter(); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | function drawChart() { |
| 68 | 68 | var data = google.visualization.arrayToDataTable([ |
| 69 | 69 | ["'._("Country").'", "'._("# of times").'"], '; |
| 70 | - $country_data = ''; |
|
| 70 | + $country_data = ''; |
|
| 71 | 71 | foreach($airport_country_array as $airport_item) |
| 72 | 72 | { |
| 73 | 73 | $country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],'; |
@@ -4,8 +4,8 @@ discard block |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['airline'])) { |
| 7 | - header('Location: '.$globalURL.'/airline'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/airline'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 11 | 11 | $Spotter = new Spotter(); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | function drawChart() { |
| 74 | 74 | var data = google.visualization.arrayToDataTable([ |
| 75 | 75 | ["'._("Hour").'", "'._("# of Flights").'"], '; |
| 76 | - $hour_data = ''; |
|
| 76 | + $hour_data = ''; |
|
| 77 | 77 | foreach($hour_array as $hour_item) |
| 78 | 78 | { |
| 79 | 79 | $hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],'; |