@@ -9,7 +9,9 @@ discard block |
||
| 9 | 9 | public function __construct($dbc = null) { |
| 10 | 10 | $Connection = new Connection($dbc); |
| 11 | 11 | $this->db = $Connection->db(); |
| 12 | - if ($this->db === null) die('Error: No DB connection.'); |
|
| 12 | + if ($this->db === null) { |
|
| 13 | + die('Error: No DB connection.'); |
|
| 14 | + } |
|
| 13 | 15 | } |
| 14 | 16 | |
| 15 | 17 | /** |
@@ -24,7 +26,9 @@ discard block |
||
| 24 | 26 | $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
| 25 | 27 | $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
| 26 | 28 | $reg = $registration; |
| 27 | - if ($reg == '' && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao; |
|
| 29 | + if ($reg == '' && $aircraft_icao != '') { |
|
| 30 | + $reg = $aircraft_icao.$airline_icao; |
|
| 31 | + } |
|
| 28 | 32 | $reg = trim($reg); |
| 29 | 33 | $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
| 30 | 34 | FROM spotter_image |
@@ -32,9 +36,13 @@ discard block |
||
| 32 | 36 | $sth = $this->db->prepare($query); |
| 33 | 37 | $sth->execute(array(':registration' => $reg)); |
| 34 | 38 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 35 | - if (!empty($result)) return $result; |
|
| 36 | - elseif ($registration != '') return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 37 | - else return array(); |
|
| 39 | + if (!empty($result)) { |
|
| 40 | + return $result; |
|
| 41 | + } elseif ($registration != '') { |
|
| 42 | + return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 43 | + } else { |
|
| 44 | + return array(); |
|
| 45 | + } |
|
| 38 | 46 | } |
| 39 | 47 | |
| 40 | 48 | /** |
@@ -77,8 +85,11 @@ discard block |
||
| 77 | 85 | public function getExifCopyright($url) { |
| 78 | 86 | $exif = exif_read_data($url); |
| 79 | 87 | $copyright = ''; |
| 80 | - if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright']; |
|
| 81 | - elseif (isset($exif['copyright'])) $copyright = $exif['copyright']; |
|
| 88 | + if (isset($exif['COMPUTED']['copyright'])) { |
|
| 89 | + $copyright = $exif['COMPUTED']['copyright']; |
|
| 90 | + } elseif (isset($exif['copyright'])) { |
|
| 91 | + $copyright = $exif['copyright']; |
|
| 92 | + } |
|
| 82 | 93 | if ($copyright != '') { |
| 83 | 94 | $copyright = str_replace('Copyright ','',$copyright); |
| 84 | 95 | $copyright = str_replace('© ','',$copyright); |
@@ -96,17 +107,27 @@ discard block |
||
| 96 | 107 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 97 | 108 | { |
| 98 | 109 | global $globalDebug,$globalAircraftImageFetch; |
| 99 | - if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return ''; |
|
| 110 | + if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) { |
|
| 111 | + return ''; |
|
| 112 | + } |
|
| 100 | 113 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
| 101 | 114 | $registration = trim($registration); |
| 102 | 115 | //getting the aircraft image |
| 103 | - if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...'; |
|
| 104 | - elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
|
| 105 | - elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
|
| 116 | + if ($globalDebug && $registration != '') { |
|
| 117 | + echo 'Try to find an aircraft image for '.$registration.'...'; |
|
| 118 | + } elseif ($globalDebug && $aircraft_icao != '') { |
|
| 119 | + echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
|
| 120 | + } elseif ($globalDebug && $airline_icao != '') { |
|
| 121 | + echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
|
| 122 | + } |
|
| 106 | 123 | $image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao); |
| 107 | - if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
|
| 124 | + if ($registration == '' && $aircraft_icao != '') { |
|
| 125 | + $registration = $aircraft_icao.$airline_icao; |
|
| 126 | + } |
|
| 108 | 127 | if ($image_url['original'] != '') { |
| 109 | - if ($globalDebug) echo 'Found !'."\n"; |
|
| 128 | + if ($globalDebug) { |
|
| 129 | + echo 'Found !'."\n"; |
|
| 130 | + } |
|
| 110 | 131 | $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
| 111 | 132 | try { |
| 112 | 133 | $sth = $this->db->prepare($query); |
@@ -115,7 +136,9 @@ discard block |
||
| 115 | 136 | echo $e->getMessage()."\n"; |
| 116 | 137 | return "error"; |
| 117 | 138 | } |
| 118 | - } elseif ($globalDebug) echo "Not found :'(\n"; |
|
| 139 | + } elseif ($globalDebug) { |
|
| 140 | + echo "Not found :'(\n"; |
|
| 141 | + } |
|
| 119 | 142 | return "success"; |
| 120 | 143 | } |
| 121 | 144 | |
@@ -128,7 +151,9 @@ discard block |
||
| 128 | 151 | public function addMarineImage($mmsi,$imo = '',$name = '') |
| 129 | 152 | { |
| 130 | 153 | global $globalDebug,$globalMarineImageFetch; |
| 131 | - if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return ''; |
|
| 154 | + if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) { |
|
| 155 | + return ''; |
|
| 156 | + } |
|
| 132 | 157 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
| 133 | 158 | $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
| 134 | 159 | $name = filter_var($name,FILTER_SANITIZE_STRING); |
@@ -138,16 +163,22 @@ discard block |
||
| 138 | 163 | $identity = $Marine->getIdentity($mmsi); |
| 139 | 164 | if (isset($identity[0]['mmsi'])) { |
| 140 | 165 | $imo = $identity[0]['imo']; |
| 141 | - if ($identity[0]['ship_name'] != '') $name = $identity[0]['ship_name']; |
|
| 166 | + if ($identity[0]['ship_name'] != '') { |
|
| 167 | + $name = $identity[0]['ship_name']; |
|
| 168 | + } |
|
| 142 | 169 | } |
| 143 | 170 | } |
| 144 | 171 | unset($Marine); |
| 145 | 172 | |
| 146 | 173 | //getting the aircraft image |
| 147 | - if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...'; |
|
| 174 | + if ($globalDebug && $name != '') { |
|
| 175 | + echo 'Try to find an vessel image for '.$name.'...'; |
|
| 176 | + } |
|
| 148 | 177 | $image_url = $this->findMarineImage($mmsi,$imo,$name); |
| 149 | 178 | if ($image_url['original'] != '') { |
| 150 | - if ($globalDebug) echo 'Found !'."\n"; |
|
| 179 | + if ($globalDebug) { |
|
| 180 | + echo 'Found !'."\n"; |
|
| 181 | + } |
|
| 151 | 182 | $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
| 152 | 183 | try { |
| 153 | 184 | $sth = $this->db->prepare($query); |
@@ -156,7 +187,9 @@ discard block |
||
| 156 | 187 | echo $e->getMessage()."\n"; |
| 157 | 188 | return "error"; |
| 158 | 189 | } |
| 159 | - } elseif ($globalDebug) echo "Not found :'(\n"; |
|
| 190 | + } elseif ($globalDebug) { |
|
| 191 | + echo "Not found :'(\n"; |
|
| 192 | + } |
|
| 160 | 193 | return "success"; |
| 161 | 194 | } |
| 162 | 195 | |
@@ -171,41 +204,85 @@ discard block |
||
| 171 | 204 | { |
| 172 | 205 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
| 173 | 206 | $Spotter = new Spotter($this->db); |
| 174 | - if (!isset($globalIVAO)) $globalIVAO = FALSE; |
|
| 207 | + if (!isset($globalIVAO)) { |
|
| 208 | + $globalIVAO = FALSE; |
|
| 209 | + } |
|
| 175 | 210 | $aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING); |
| 176 | 211 | if ($aircraft_registration != '' && (!isset($globalVA) || $globalVA !== TRUE)) { |
| 177 | - if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 212 | + if (strpos($aircraft_registration,'/') !== false) { |
|
| 213 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 214 | + } |
|
| 178 | 215 | $aircraft_registration = urlencode(trim($aircraft_registration)); |
| 179 | 216 | $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration); |
| 180 | - if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name']; |
|
| 181 | - else $aircraft_name = ''; |
|
| 182 | - if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao']; |
|
| 183 | - else $aircraft_icao = ''; |
|
| 184 | - if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao']; |
|
| 185 | - else $airline_icao = ''; |
|
| 217 | + if (isset($aircraft_info[0]['aircraft_name'])) { |
|
| 218 | + $aircraft_name = $aircraft_info[0]['aircraft_name']; |
|
| 219 | + } else { |
|
| 220 | + $aircraft_name = ''; |
|
| 221 | + } |
|
| 222 | + if (isset($aircraft_info[0]['aircraft_icao'])) { |
|
| 223 | + $aircraft_name = $aircraft_info[0]['aircraft_icao']; |
|
| 224 | + } else { |
|
| 225 | + $aircraft_icao = ''; |
|
| 226 | + } |
|
| 227 | + if (isset($aircraft_info[0]['airline_icao'])) { |
|
| 228 | + $airline_icao = $aircraft_info[0]['airline_icao']; |
|
| 229 | + } else { |
|
| 230 | + $airline_icao = ''; |
|
| 231 | + } |
|
| 186 | 232 | } elseif ($aircraft_icao != '') { |
| 187 | 233 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao); |
| 188 | - if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type']; |
|
| 189 | - else $aircraft_name = ''; |
|
| 234 | + if (isset($aircraft_info[0]['type'])) { |
|
| 235 | + $aircraft_name = $aircraft_info[0]['type']; |
|
| 236 | + } else { |
|
| 237 | + $aircraft_name = ''; |
|
| 238 | + } |
|
| 190 | 239 | $aircraft_registration = $aircraft_icao; |
| 191 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 240 | + } else { |
|
| 241 | + return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 242 | + } |
|
| 192 | 243 | unset($Spotter); |
| 193 | - if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 244 | + if (!isset($globalAircraftImageSources)) { |
|
| 245 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 246 | + } |
|
| 194 | 247 | foreach ($globalAircraftImageSources as $source) { |
| 195 | 248 | $source = strtolower($source); |
| 196 | - if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
| 197 | - if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
| 198 | - if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
| 199 | - if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
| 200 | - if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
| 201 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
| 202 | - if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
| 203 | - if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
| 204 | - if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
| 205 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
| 206 | - if (isset($images_array) && $images_array['original'] != '') return $images_array; |
|
| 207 | - } |
|
| 208 | - if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao); |
|
| 249 | + if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') { |
|
| 250 | + $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
| 251 | + } |
|
| 252 | + if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) { |
|
| 253 | + $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
| 254 | + } |
|
| 255 | + if ($source == 'flickr' && extension_loaded('simplexml')) { |
|
| 256 | + $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
| 257 | + } |
|
| 258 | + if ($source == 'bing') { |
|
| 259 | + $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
| 260 | + } |
|
| 261 | + if ($source == 'deviantart' && extension_loaded('simplexml')) { |
|
| 262 | + $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
| 263 | + } |
|
| 264 | + if ($source == 'wikimedia') { |
|
| 265 | + $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
| 266 | + } |
|
| 267 | + if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) { |
|
| 268 | + $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
| 269 | + } |
|
| 270 | + if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) { |
|
| 271 | + $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
| 272 | + } |
|
| 273 | + if ($source == 'airportdata' && !$globalIVAO) { |
|
| 274 | + $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
| 275 | + } |
|
| 276 | + if ($source == 'customsources') { |
|
| 277 | + $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
| 278 | + } |
|
| 279 | + if (isset($images_array) && $images_array['original'] != '') { |
|
| 280 | + return $images_array; |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) { |
|
| 284 | + return $this->findAircraftImage($aircraft_icao); |
|
| 285 | + } |
|
| 209 | 286 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 210 | 287 | } |
| 211 | 288 | |
@@ -225,7 +302,9 @@ discard block |
||
| 225 | 302 | //$imo = filter_var($imo,FILTER_SANITIZE_STRING); |
| 226 | 303 | $name = filter_var($name,FILTER_SANITIZE_STRING); |
| 227 | 304 | $name = trim($name); |
| 228 | - if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 305 | + if (strlen($name) < 4) { |
|
| 306 | + return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 307 | + } |
|
| 229 | 308 | /* |
| 230 | 309 | $Marine = new Marine($this->db); |
| 231 | 310 | if ($imo == '' || $name == '') { |
@@ -237,15 +316,29 @@ discard block |
||
| 237 | 316 | } |
| 238 | 317 | unset($Marine); |
| 239 | 318 | */ |
| 240 | - if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
| 319 | + if (!isset($globalMarineImageSources)) { |
|
| 320 | + $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
| 321 | + } |
|
| 241 | 322 | foreach ($globalMarineImageSources as $source) { |
| 242 | 323 | $source = strtolower($source); |
| 243 | - if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
| 244 | - if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name); |
|
| 245 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
| 246 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
| 247 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
| 248 | - if (isset($images_array) && $images_array['original'] != '') return $images_array; |
|
| 324 | + if ($source == 'flickr') { |
|
| 325 | + $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
| 326 | + } |
|
| 327 | + if ($source == 'bing') { |
|
| 328 | + $images_array = $this->fromBing('marine',$mmsi,$name); |
|
| 329 | + } |
|
| 330 | + if ($source == 'deviantart') { |
|
| 331 | + $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
| 332 | + } |
|
| 333 | + if ($source == 'wikimedia') { |
|
| 334 | + $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
| 335 | + } |
|
| 336 | + if ($source == 'customsources') { |
|
| 337 | + $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
| 338 | + } |
|
| 339 | + if (isset($images_array) && $images_array['original'] != '') { |
|
| 340 | + return $images_array; |
|
| 341 | + } |
|
| 249 | 342 | } |
| 250 | 343 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 251 | 344 | } |
@@ -268,7 +361,9 @@ discard block |
||
| 268 | 361 | $url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
| 269 | 362 | } |
| 270 | 363 | $data = $Common->getData($url); |
| 271 | - if (substr($data, 0, 5) != "<?xml") return false; |
|
| 364 | + if (substr($data, 0, 5) != "<?xml") { |
|
| 365 | + return false; |
|
| 366 | + } |
|
| 272 | 367 | if ($xml = simplexml_load_string($data)) { |
| 273 | 368 | if (isset($xml->channel->item)) { |
| 274 | 369 | $image_url = array(); |
@@ -307,7 +402,9 @@ discard block |
||
| 307 | 402 | $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
| 308 | 403 | } |
| 309 | 404 | $data = $Common->getData($url); |
| 310 | - if (substr($data, 0, 5) != "<?xml") return false; |
|
| 405 | + if (substr($data, 0, 5) != "<?xml") { |
|
| 406 | + return false; |
|
| 407 | + } |
|
| 311 | 408 | if ($xml = simplexml_load_string($data)) { |
| 312 | 409 | if (isset($xml->channel->item->link)) { |
| 313 | 410 | $image_url = array(); |
@@ -411,14 +508,22 @@ discard block |
||
| 411 | 508 | public function fromFlickr($type,$registration,$name='') { |
| 412 | 509 | $Common = new Common(); |
| 413 | 510 | if ($type == 'aircraft') { |
| 414 | - if ($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='.$registration.','.urlencode($name); |
|
| 415 | - else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft'; |
|
| 511 | + if ($name != '') { |
|
| 512 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
|
| 513 | + } else { |
|
| 514 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft'; |
|
| 515 | + } |
|
| 416 | 516 | } elseif ($type == 'marine') { |
| 417 | - if ($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=ship,'.urlencode($name); |
|
| 418 | - else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship'; |
|
| 517 | + if ($name != '') { |
|
| 518 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name); |
|
| 519 | + } else { |
|
| 520 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship'; |
|
| 521 | + } |
|
| 419 | 522 | } |
| 420 | 523 | $data = $Common->getData($url); |
| 421 | - if (substr($data, 0, 5) != "<?xml") return false; |
|
| 524 | + if (substr($data, 0, 5) != "<?xml") { |
|
| 525 | + return false; |
|
| 526 | + } |
|
| 422 | 527 | if ($xml = simplexml_load_string($data)) { |
| 423 | 528 | if (isset($xml->channel->item)) { |
| 424 | 529 | $original_url = trim((string)$xml->channel->item->enclosure->attributes()->url); |
@@ -461,13 +566,21 @@ discard block |
||
| 461 | 566 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
| 462 | 567 | global $globalImageBingKey; |
| 463 | 568 | $Common = new Common(); |
| 464 | - if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false; |
|
| 569 | + if (!isset($globalImageBingKey) || $globalImageBingKey == '') { |
|
| 570 | + return false; |
|
| 571 | + } |
|
| 465 | 572 | if ($type == 'aircraft') { |
| 466 | - if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 467 | - else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 573 | + if ($aircraft_name != '') { |
|
| 574 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 575 | + } else { |
|
| 576 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 577 | + } |
|
| 468 | 578 | } elseif ($type == 'marine') { |
| 469 | - if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27'; |
|
| 470 | - else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27'; |
|
| 579 | + if ($aircraft_name != '') { |
|
| 580 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27'; |
|
| 581 | + } else { |
|
| 582 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27'; |
|
| 583 | + } |
|
| 471 | 584 | } |
| 472 | 585 | $headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey)); |
| 473 | 586 | $data = $Common->getData($url,'get','',$headers); |
@@ -523,17 +636,25 @@ discard block |
||
| 523 | 636 | public function fromWikimedia($type,$registration,$name='') { |
| 524 | 637 | $Common = new Common(); |
| 525 | 638 | if ($type == 'aircraft') { |
| 526 | - if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
|
| 527 | - else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
|
| 639 | + if ($name != '') { |
|
| 640 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
|
| 641 | + } else { |
|
| 642 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
|
| 643 | + } |
|
| 528 | 644 | } elseif ($type == 'marine') { |
| 529 | - if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"'; |
|
| 530 | - else return false; |
|
| 645 | + if ($name != '') { |
|
| 646 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"'; |
|
| 647 | + } else { |
|
| 648 | + return false; |
|
| 649 | + } |
|
| 531 | 650 | } |
| 532 | 651 | $data = $Common->getData($url); |
| 533 | 652 | $result = json_decode($data); |
| 534 | 653 | if (isset($result->query->search[0]->title)) { |
| 535 | 654 | $fileo = $result->query->search[0]->title; |
| 536 | - if (substr($fileo,-3) == 'pdf') return false; |
|
| 655 | + if (substr($fileo,-3) == 'pdf') { |
|
| 656 | + return false; |
|
| 657 | + } |
|
| 537 | 658 | $file = urlencode($fileo); |
| 538 | 659 | $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file; |
| 539 | 660 | $data2 = $Common->getData($url2); |
@@ -604,18 +725,27 @@ discard block |
||
| 604 | 725 | $image_url = array(); |
| 605 | 726 | $image_url['thumbnail'] = $url_thumbnail; |
| 606 | 727 | $image_url['original'] = $url; |
| 607 | - if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
|
| 608 | - else $exifCopyright = ''; |
|
| 609 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 610 | - elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
|
| 611 | - else $image_url['copyright'] = $source['source_website']; |
|
| 728 | + if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) { |
|
| 729 | + $exifCopyright = $this->getExifCopyright($url); |
|
| 730 | + } else { |
|
| 731 | + $exifCopyright = ''; |
|
| 732 | + } |
|
| 733 | + if ($exifCopyright != '') { |
|
| 734 | + $image_url['copyright'] = $exifCopyright; |
|
| 735 | + } elseif (isset($source['copyright'])) { |
|
| 736 | + $image_url['copyright'] = $source['copyright']; |
|
| 737 | + } else { |
|
| 738 | + $image_url['copyright'] = $source['source_website']; |
|
| 739 | + } |
|
| 612 | 740 | $image_url['source_website'] = $source['source_website']; |
| 613 | 741 | $image_url['source'] = $source['source']; |
| 614 | 742 | return $image_url; |
| 615 | 743 | } |
| 616 | 744 | } |
| 617 | 745 | return false; |
| 618 | - } else return false; |
|
| 746 | + } else { |
|
| 747 | + return false; |
|
| 748 | + } |
|
| 619 | 749 | if (!empty($globalMarineImageCustomSources) && $type == 'marine') { |
| 620 | 750 | $customsources = array(); |
| 621 | 751 | if (!isset($globalMarineImageCustomSources[0])) { |
@@ -640,18 +770,27 @@ discard block |
||
| 640 | 770 | $image_url = array(); |
| 641 | 771 | $image_url['thumbnail'] = $url_thumbnail; |
| 642 | 772 | $image_url['original'] = $url; |
| 643 | - if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
|
| 644 | - else $exifCopyright = ''; |
|
| 645 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 646 | - elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
|
| 647 | - else $image_url['copyright'] = $source['source_website']; |
|
| 773 | + if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) { |
|
| 774 | + $exifCopyright = $this->getExifCopyright($url); |
|
| 775 | + } else { |
|
| 776 | + $exifCopyright = ''; |
|
| 777 | + } |
|
| 778 | + if ($exifCopyright != '') { |
|
| 779 | + $image_url['copyright'] = $exifCopyright; |
|
| 780 | + } elseif (isset($source['copyright'])) { |
|
| 781 | + $image_url['copyright'] = $source['copyright']; |
|
| 782 | + } else { |
|
| 783 | + $image_url['copyright'] = $source['source_website']; |
|
| 784 | + } |
|
| 648 | 785 | $image_url['source_website'] = $source['source_website']; |
| 649 | 786 | $image_url['source'] = $source['source']; |
| 650 | 787 | return $image_url; |
| 651 | 788 | } |
| 652 | 789 | } |
| 653 | 790 | return false; |
| 654 | - } else return false; |
|
| 791 | + } else { |
|
| 792 | + return false; |
|
| 793 | + } |
|
| 655 | 794 | } |
| 656 | 795 | } |
| 657 | 796 | |