Inspection of "Merge pull request #455 from Struart88/patch-1" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 75f113...b78c73 )

by Yannick

created 2020-06-12 10:44 UTC

Status

Doc Comments +11 added lines, -4 removed lines patch added patch discarded remove patch

@@ -286,6 +286,7 @@  discard block
 block discarded – undo
 	*
 	* @param String $aircraft_registration the registration of the aircraft
 	* @param String $aircraft_name type of the aircraft
+	* @param string $type
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
@@ -318,7 +319,7 @@  discard block
 block discarded – undo
     /**
      * Gets the aircraft image from Deviantart
      *
-     * @param $type
+     * @param string $type
      * @param String $registration the registration of the aircraft
      * @param String $name type of the aircraft
      * @return array the aircraft thumbnail, orignal url and copyright
@@ -360,6 +361,7 @@  discard block
 block discarded – undo
 	*
 	* @param String $aircraft_registration the registration of the aircraft
 	* @param String $aircraft_name type of the aircraft
+	* @param string $type
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
@@ -402,6 +404,7 @@  discard block
 block discarded – undo
 	*
 	* @param String $aircraft_registration the registration of the aircraft
 	* @param String $aircraft_name type of the aircraft
+	* @param string $type
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
@@ -436,6 +439,7 @@  discard block
 block discarded – undo
 	*
 	* @param String $registration the registration of the aircraft
 	* @param String $name type of the aircraft
+	* @param string $type
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
@@ -466,8 +470,8 @@  discard block
 block discarded – undo
 	}
 
     /**
-     * @param $type
-     * @param $aircraft_icao
+     * @param string $type
+     * @param string $aircraft_icao
      * @param $airline_icao
      * @return array
      */
@@ -490,7 +494,7 @@  discard block
 block discarded – undo
     /**
      * Gets the aircraft image from Bing
      *
-     * @param $type
+     * @param string $type
      * @param String $aircraft_registration the registration of the aircraft
      * @param String $aircraft_name type of the aircraft
      * @return array the aircraft thumbnail, orignal url and copyright
@@ -530,6 +534,7 @@  discard block
 block discarded – undo
 	* @param String $aircraft_registration the registration of the aircraft
 	* @param String $aircraft_icao the icao code of the aircraft
 	* @param String $aircraft_name type of the aircraft
+	* @param string $type
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
@@ -555,6 +560,7 @@  discard block
 block discarded – undo
 	*
 	* @param String $registration the registration of the aircraft/mmsi
 	* @param String $name name
+	* @param string $type
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
@@ -616,6 +622,7 @@  discard block
 block discarded – undo
 	*
 	* @param String $registration the registration of the aircraft
 	* @param String $name type of the aircraft
+	* @param string $type
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/

Please login to merge, or discard this patch.

Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

@@ -22,14 +22,14 @@  discard block
 block discarded – undo
 		if ($this->db === null) die('Error: No DB connection. (Image)');
 	}
 
-    /**
-     * Gets the images based on the aircraft registration
-     *
-     * @param $registration
-     * @param string $aircraft_icao
-     * @param string $airline_icao
-     * @return array the images list
-     */
+	/**
+	 * Gets the images based on the aircraft registration
+	 *
+	 * @param $registration
+	 * @param string $aircraft_icao
+	 * @param string $airline_icao
+	 * @return array the images list
+	 */
 	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -49,15 +49,15 @@  discard block
 block discarded – undo
 		else return array();
 	}
 
-    /**
-     * Gets the images based on the ship name
-     *
-     * @param $mmsi
-     * @param string $imo
-     * @param string $name
-     * @param string $type_name
-     * @return array the images list
-     */
+	/**
+	 * Gets the images based on the ship name
+	 *
+	 * @param $mmsi
+	 * @param string $imo
+	 * @param string $name
+	 * @param string $type_name
+	 * @return array the images list
+	 */
 	public function getMarineImage($mmsi,$imo = '',$name = '',$type_name = '')
 	{
 		global $globalMarineImagePics;
@@ -94,12 +94,12 @@  discard block
 block discarded – undo
 		return $result;
 	}
 
-    /**
-     * Gets the image copyright based on the Exif data
-     *
-     * @param $url
-     * @return String image copyright
-     */
+	/**
+	 * Gets the image copyright based on the Exif data
+	 *
+	 * @param $url
+	 * @return String image copyright
+	 */
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
@@ -113,14 +113,14 @@  discard block
 block discarded – undo
 		return $copyright;
 	}
 
-    /**
-     * Adds the images based on the aircraft registration
-     *
-     * @param $registration
-     * @param string $aircraft_icao
-     * @param string $airline_icao
-     * @return String either success or error
-     */
+	/**
+	 * Adds the images based on the aircraft registration
+	 *
+	 * @param $registration
+	 * @param string $aircraft_icao
+	 * @param string $airline_icao
+	 * @return String either success or error
+	 */
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch, $globalOffline;
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
 		return "success";
 	}
 
-    /**
-     * Adds the images based on the marine name
-     *
-     * @param $mmsi
-     * @param string $imo
-     * @param string $name
-     * @return String either success or error
-     */
+	/**
+	 * Adds the images based on the marine name
+	 *
+	 * @param $mmsi
+	 * @param string $imo
+	 * @param string $name
+	 * @return String either success or error
+	 */
 	public function addMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalDebug,$globalMarineImageFetch, $globalOffline;
@@ -190,14 +190,14 @@  discard block
 block discarded – undo
 		return "success";
 	}
 
-    /**
-     * Gets the aircraft image
-     *
-     * @param String $aircraft_registration the registration of the aircraft
-     * @param string $aircraft_icao
-     * @param string $airline_icao
-     * @return array the aircraft thumbnail, orignal url and copyright
-     */
+	/**
+	 * Gets the aircraft image
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param string $aircraft_icao
+	 * @param string $airline_icao
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 */
 	public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
@@ -241,14 +241,14 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets the vessel image
-	*
-	* @param String $mmsi the vessel mmsi
-	* @param String $imo the vessel imo
-	* @param String $name the vessel name
-	* @return array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the vessel image
+	 *
+	 * @param String $mmsi the vessel mmsi
+	 * @param String $imo the vessel imo
+	 * @param String $name the vessel name
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function findMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalMarineImageSources;
@@ -282,13 +282,13 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets the aircraft image from Planespotters
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Planespotters
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
@@ -315,14 +315,14 @@  discard block
 block discarded – undo
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
 
-    /**
-     * Gets the aircraft image from Deviantart
-     *
-     * @param $type
-     * @param String $registration the registration of the aircraft
-     * @param String $name type of the aircraft
-     * @return array the aircraft thumbnail, orignal url and copyright
-     */
+	/**
+	 * Gets the aircraft image from Deviantart
+	 *
+	 * @param $type
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 */
 	public function fromDeviantart($type,$registration, $name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -356,13 +356,13 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets the aircraft image from JetPhotos
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from JetPhotos
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
@@ -398,13 +398,13 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets the aircraft image from PlanePictures
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from PlanePictures
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
@@ -432,13 +432,13 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets the aircraft image from Flickr
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Flickr
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromFlickr($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -465,13 +465,13 @@  discard block
 block discarded – undo
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
 
-    /**
-     * @param $type
-     * @param $aircraft_icao
-     * @param $airline_icao
-     * @return array
-     */
-    public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) {
+	/**
+	 * @param $type
+	 * @param $aircraft_icao
+	 * @param $airline_icao
+	 * @return array
+	 */
+	public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) {
 		$Common = new Common();
 		//echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
 		if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) {
@@ -487,14 +487,14 @@  discard block
 block discarded – undo
 		}
 	}
 
-    /**
-     * Gets the aircraft image from Bing
-     *
-     * @param $type
-     * @param String $aircraft_registration the registration of the aircraft
-     * @param String $aircraft_name type of the aircraft
-     * @return array the aircraft thumbnail, orignal url and copyright
-     */
+	/**
+	 * Gets the aircraft image from Bing
+	 *
+	 * @param $type
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 */
 	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
@@ -525,14 +525,14 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets the aircraft image from airport-data
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_icao the icao code of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from airport-data
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_icao the icao code of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromAirportData($type,$aircraft_registration,$aircraft_icao,$aircraft_name='') {
 		$Common = new Common();
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration.'&m='.$aircraft_icao;
@@ -551,13 +551,13 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets image from WikiMedia
-	*
-	* @param String $registration the registration of the aircraft/mmsi
-	* @param String $name name
-	* @return array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets image from WikiMedia
+	 *
+	 * @param String $registration the registration of the aircraft/mmsi
+	 * @param String $name name
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromWikimedia($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -612,13 +612,13 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets the aircraft image from custom url
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from custom url
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromCustomSource($type,$registration,$name='') {
 		global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);

Please login to merge, or discard this patch.

Spacing +131 added lines, -131 removed lines patch added patch discarded remove patch

@@ -30,22 +30,22 @@  discard block
 block discarded – undo
      * @param string $airline_icao
      * @return array the images list
      */
-	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
+	public function getSpotterImage($registration, $aircraft_icao = '', $airline_icao = '')
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 		$reg = $registration;
 		if (($reg == '' || $reg == 'NA') && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao;
 		$reg = trim($reg);
-		$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 
+		$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 
 			FROM spotter_image 
 			WHERE spotter_image.registration = :registration LIMIT 1";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $reg));
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (!empty($result)) return $result;
-		elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
+		elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) return $this->getSpotterImage('', $aircraft_icao, $airline_icao);
 		else return array();
 	}
 
@@ -58,34 +58,34 @@  discard block
 block discarded – undo
      * @param string $type_name
      * @return array the images list
      */
-	public function getMarineImage($mmsi,$imo = '',$name = '',$type_name = '')
+	public function getMarineImage($mmsi, $imo = '', $name = '', $type_name = '')
 	{
 		global $globalMarineImagePics;
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$name = filter_var($name,FILTER_SANITIZE_STRING);
-		$type_name = str_replace('&#39;',"'",filter_var($type_name,FILTER_SANITIZE_STRING));
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
+		$name = filter_var($name, FILTER_SANITIZE_STRING);
+		$type_name = str_replace('&#39;', "'", filter_var($type_name, FILTER_SANITIZE_STRING));
 		if (isset($globalMarineImagePics) && !empty($globalMarineImagePics)) {
 			if ($type_name != '' && isset($globalMarineImagePics['type'][$type_name])) {
 				if (!isset($globalMarineImagePics['type'][$type_name]['image_thumbnail'])) {
 					$globalMarineImagePics['type'][$type_name]['image_thumbnail'] = $globalMarineImagePics['type'][$type_name]['image'];
 				}
-				return array($globalMarineImagePics['type'][$type_name]+array('image_thumbnail' => '','image' => '', 'image_copyright' => '','image_source' => '','image_source_website' => ''));
+				return array($globalMarineImagePics['type'][$type_name] + array('image_thumbnail' => '', 'image' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			}
 		}
 		$name = trim($name);
 		if ($mmsi == '' && $imo == '' && $name == '') return array();
-		$query  = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name 
+		$query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name 
 			FROM marine_image 
 			WHERE marine_image.mmsi = :mmsi";
 		$query_data = array(':mmsi' => $mmsi);
 		if ($imo != '') {
 			$query .= " AND marine_image.imo = :imo";
-			$query_data = array_merge($query_data,array(':imo' => $imo));
+			$query_data = array_merge($query_data, array(':imo' => $imo));
 		}
 		if ($name != '') {
 			$query .= " AND marine_image.name = :name";
-			$query_data = array_merge($query_data,array(':name' => $name));
+			$query_data = array_merge($query_data, array(':name' => $name));
 		}
 		$query .= " LIMIT 1";
 		$sth = $this->db->prepare($query);
@@ -106,9 +106,9 @@  discard block
 block discarded – undo
 		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
 		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
 		if ($copyright != '') {
-			$copyright = str_replace('Copyright ','',$copyright);
-			$copyright = str_replace('© ','',$copyright);
-			$copyright = str_replace('(c) ','',$copyright);
+			$copyright = str_replace('Copyright ', '', $copyright);
+			$copyright = str_replace('© ', '', $copyright);
+			$copyright = str_replace('(c) ', '', $copyright);
 		}
 		return $copyright;
 	}
@@ -121,25 +121,25 @@  discard block
 block discarded – undo
      * @param string $airline_icao
      * @return String either success or error
      */
-	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
+	public function addSpotterImage($registration, $aircraft_icao = '', $airline_icao = '')
 	{
-		global $globalDebug,$globalAircraftImageFetch, $globalOffline;
+		global $globalDebug, $globalAircraftImageFetch, $globalOffline;
 		if ((isset($globalAircraftImageFetch) && $globalAircraftImageFetch === FALSE) || (isset($globalOffline) && $globalOffline === TRUE)) return '';
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		$registration = trim($registration);
 		//getting the aircraft image
 		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
 		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
 		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
-		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
+		$image_url = $this->findAircraftImage($registration, $aircraft_icao, $airline_icao);
 		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
 		if ($image_url['original'] != '') {
 			if ($globalDebug) echo 'Found !'."\n";
-			$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)";
+			$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)";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website']));
-			} catch(PDOException $e) {
+				$sth->execute(array(':registration' => $registration, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website']));
+			} catch (PDOException $e) {
 				echo $e->getMessage()."\n";
 				return "error";
 			}
@@ -155,13 +155,13 @@  discard block
 block discarded – undo
      * @param string $name
      * @return String either success or error
      */
-	public function addMarineImage($mmsi,$imo = '',$name = '')
+	public function addMarineImage($mmsi, $imo = '', $name = '')
 	{
-		global $globalDebug,$globalMarineImageFetch, $globalOffline;
+		global $globalDebug, $globalMarineImageFetch, $globalOffline;
 		if ((isset($globalMarineImageFetch) && !$globalMarineImageFetch) || (isset($globalOffline) && $globalOffline === TRUE)) return '';
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$name = filter_var($name,FILTER_SANITIZE_STRING);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
+		$name = filter_var($name, FILTER_SANITIZE_STRING);
 		$name = trim($name);
 		$Marine = new Marine($this->db);
 		if ($imo == '' || $name == '') {
@@ -175,14 +175,14 @@  discard block
 block discarded – undo
 
 		//getting the aircraft image
 		if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...';
-		$image_url = $this->findMarineImage($mmsi,$imo,$name);
+		$image_url = $this->findMarineImage($mmsi, $imo, $name);
 		if ($image_url['original'] != '') {
 			if ($globalDebug) echo 'Found !'."\n";
-			$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)";
+			$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)";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':name' => $name,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website']));
-			} catch(PDOException $e) {
+				$sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':name' => $name, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website']));
+			} catch (PDOException $e) {
 				echo $e->getMessage()."\n";
 				return "error";
 			}
@@ -203,9 +203,9 @@  discard block
 block discarded – undo
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
 		$Spotter = new Spotter($this->db);
 		if (!isset($globalIVAO)) $globalIVAO = FALSE;
-		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
+		$aircraft_registration = filter_var($aircraft_registration, FILTER_SANITIZE_STRING);
 		if ($aircraft_registration != '' && $aircraft_registration != 'NA' && (!isset($globalVA) || $globalVA !== TRUE)) {
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (strpos($aircraft_registration, '/') !== false) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 			$aircraft_registration = urlencode(trim($aircraft_registration));
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
 			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
@@ -219,25 +219,25 @@  discard block
 block discarded – undo
 			if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type'];
 			else $aircraft_name = '';
 			$aircraft_registration = $aircraft_icao;
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		} else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		unset($Spotter);
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
 		foreach ($globalAircraftImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
-			if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_icao,$aircraft_name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft', $aircraft_icao, $airline_icao);
+			if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'bing') $images_array = $this->fromBing('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft', $aircraft_registration, $aircraft_icao, $aircraft_name);
+			if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft', $aircraft_registration, $aircraft_name);
 			if (isset($images_array) && $images_array['original'] != '') return $images_array;
 		}
 		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao);
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -249,14 +249,14 @@  discard block
 block discarded – undo
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function findMarineImage($mmsi,$imo = '',$name = '')
+	public function findMarineImage($mmsi, $imo = '', $name = '')
 	{
 		global $globalMarineImageSources;
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
 		//$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$name = filter_var($name,FILTER_SANITIZE_STRING);
+		$name = filter_var($name, FILTER_SANITIZE_STRING);
 		$name = trim($name);
-		if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		if (strlen($name) < 4) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		/*
 		$Marine = new Marine($this->db);
 		if ($imo == '' || $name == '') {
@@ -268,17 +268,17 @@  discard block
 block discarded – undo
 		}
 		unset($Marine);
 		*/
-		if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
+		if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia', 'deviantart', 'flickr', 'bing');
 		foreach ($globalMarineImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name);
-			if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name);
+			if ($source == 'flickr') $images_array = $this->fromFlickr('marine', $mmsi, $name);
+			if ($source == 'bing') $images_array = $this->fromBing('marine', $mmsi, $name);
+			if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine', $mmsi, $name);
+			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine', $mmsi, $name);
+			if ($source == 'customsources') $images_array = $this->fromCustomSource('marine', $mmsi, $name);
 			if (isset($images_array) && $images_array['original'] != '') return $images_array;
 		}
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -289,30 +289,30 @@  discard block
 block discarded – undo
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') {
+	public function fromPlanespotters($type, $aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
-		if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') {
-			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
+		if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') {
+			$url = 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
 		} else {
 			//$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss';
-			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
+			$url = 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
 				$image_url = array();
-				$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
+				$thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
 				$image_url['thumbnail'] = $thumbnail_url;
-				$image_url['original'] = str_replace('thumbnail','original',$thumbnail_url);
-				$image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright);
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['original'] = str_replace('thumbnail', 'original', $thumbnail_url);
+				$image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright);
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'planespotters';
 				return $image_url;
 			}
 		} 
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
     /**
@@ -323,36 +323,36 @@  discard block
 block discarded – undo
      * @param String $name type of the aircraft
      * @return array the aircraft thumbnail, orignal url and copyright
      */
-	public function fromDeviantart($type,$registration, $name='') {
+	public function fromDeviantart($type, $registration, $name = '') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
 			// If aircraft registration is only number, also check with aircraft model
-			if (preg_match('/^[[:digit]]+$/',$registration) && $name != '') {
-				$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name);
+			if (preg_match('/^[[:digit]]+$/', $registration) && $name != '') {
+				$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name);
 			} else {
-				$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration;
+				$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration;
 			}
 		} elseif ($type == 'marine') {
-			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=ship%20"'.urlencode($name).'"';
+			$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=ship%20"'.urlencode($name).'"';
 		} else {
-			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"';
+			$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"';
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item->link)) {
 				$image_url = array();
-				$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
+				$thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
 				$image_url['thumbnail'] = $thumbnail_url;
-				$original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
+				$original_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
 				$image_url['original'] = $original_url;
-				$image_url['copyright'] = str_replace('Copyright ','',trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright));
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['copyright'] = str_replace('Copyright ', '', trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright));
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'deviantart';
 				return $image_url;
 			}
 		} 
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -363,38 +363,38 @@  discard block
 block discarded – undo
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') {
+	public function fromJetPhotos($type, $aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
-		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
+		$url = 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
 		$data = $Common->getData($url);
 		$dom = new DOMDocument();
 		@$dom->loadHTML($data);
 		$all_pics = array();
-		foreach($dom->getElementsByTagName('img') as $image) {
+		foreach ($dom->getElementsByTagName('img') as $image) {
 			if ($image->getAttribute('itemprop') == "http://schema.org/image") {
 				$all_pics[] = $image->getAttribute('src');
 			}
 		}
 		$all_authors = array();
-		foreach($dom->getElementsByTagName('meta') as $author) {
+		foreach ($dom->getElementsByTagName('meta') as $author) {
 			if ($author->getAttribute('itemprop') == "http://schema.org/author") {
 				$all_authors[] = $author->getAttribute('content');
 			}
 		}
 		$all_ref = array();
-		foreach($dom->getElementsByTagName('a') as $link) {
+		foreach ($dom->getElementsByTagName('a') as $link) {
 			$all_ref[] = $link->getAttribute('href');
 		}
 		if (isset($all_pics[0])) {
 			$image_url = array();
 			$image_url['thumbnail'] = $all_pics[0];
-			$image_url['original'] = str_replace('_tb','',$all_pics[0]);
+			$image_url['original'] = str_replace('_tb', '', $all_pics[0]);
 			$image_url['copyright'] = $all_authors[0];
 			$image_url['source_website'] = 'http://jetphotos.net'.$all_ref[8];
 			$image_url['source'] = 'JetPhotos';
 			return $image_url;
 		}
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -405,30 +405,30 @@  discard block
 block discarded – undo
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') {
+	public function fromPlanePictures($type, $aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
-		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
+		$url = 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
 		$data = $Common->getData($url);
 		$dom = new DOMDocument();
 		@$dom->loadHTML($data);
 		$all_pics = array();
-		foreach($dom->getElementsByTagName('img') as $image) {
+		foreach ($dom->getElementsByTagName('img') as $image) {
 			$all_pics[] = $image->getAttribute('src');
 		}
 		$all_links = array();
-		foreach($dom->getElementsByTagName('a') as $link) {
-			$all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href'));
+		foreach ($dom->getElementsByTagName('a') as $link) {
+			$all_links[] = array('text' => $link->textContent, 'href' => $link->getAttribute('href'));
 		}
-		if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1]) && !preg_match('/flagge/',$all_pics[1])) {
+		if (isset($all_pics[1]) && !preg_match('/bit.ly/', $all_pics[1]) && !preg_match('/flagge/', $all_pics[1])) {
 			$image_url = array();
 			$image_url['thumbnail'] = 'http://www.planepictures.net/'.$all_pics[1];
-			$image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN','',$all_pics[1]);
+			$image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN', '', $all_pics[1]);
 			$image_url['copyright'] = $all_links[6]['text'];
 			$image_url['source_website'] = 'http://www.planepictures.net/'.$all_links[2]['href'];
 			$image_url['source'] = 'PlanePictures';
 			return $image_url;
 		}
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromFlickr($type,$registration,$name='') {
+	public function fromFlickr($type, $registration, $name = '') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
 			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);
@@ -449,20 +449,20 @@  discard block
 block discarded – undo
 			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';
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
-				$original_url = trim((string)$xml->channel->item->enclosure->attributes()->url);
+				$original_url = trim((string) $xml->channel->item->enclosure->attributes()->url);
 				$image_url = array();
 				$image_url['thumbnail'] = $original_url;
 				$image_url['original'] = $original_url;
-				$image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->credit);
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->credit);
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'flickr';
 				return $image_url;
 			}
 		} 
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
     /**
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
 			$image_url['source'] = 'ivao.aero';
 			return $image_url;
 		} else {
-			return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		}
 	}
 
@@ -495,10 +495,10 @@  discard block
 block discarded – undo
      * @param String $aircraft_name type of the aircraft
      * @return array the aircraft thumbnail, orignal url and copyright
      */
-	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
+	public function fromBing($type, $aircraft_registration, $aircraft_name = '') {
 		global $globalImageBingKey;
 		$Common = new Common();
-		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		if ($type == 'aircraft') {
 			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';
 			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';
@@ -506,8 +506,8 @@  discard block
 block discarded – undo
 			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';
 			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';
 		}
-		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
-		$data = $Common->getData($url,'get','',$headers);
+		$headers = array("Authorization: Basic ".base64_encode("ignored:".$globalImageBingKey));
+		$data = $Common->getData($url, 'get', '', $headers);
 		$result = json_decode($data);
 		if (isset($result->d->results[0]->MediaUrl)) {
 			$image_url = array();
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
 			$image_url['source'] = 'bing';
 			return $image_url;
 		}
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -533,21 +533,21 @@  discard block
 block discarded – undo
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromAirportData($type,$aircraft_registration,$aircraft_icao,$aircraft_name='') {
+	public function fromAirportData($type, $aircraft_registration, $aircraft_icao, $aircraft_name = '') {
 		$Common = new Common();
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration.'&m='.$aircraft_icao;
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->count) && $result->count > 0) {
 			$image_url = array();
-			$image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image);
+			$image_url['original'] = str_replace('thumbnails', 'large', $result->data[0]->image);
 			$image_url['source_website'] = $result->data[0]->link;
 			$image_url['thumbnail'] = $result->data[0]->image;
 			$image_url['copyright'] = $result->data[0]->photographer;
 			$image_url['source'] = 'AirportData';
 			return $image_url;
 		}
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -558,20 +558,20 @@  discard block
 block discarded – undo
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromWikimedia($type,$registration,$name='') {
+	public function fromWikimedia($type, $registration, $name = '') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
 			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);
 			else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
 		} elseif ($type == 'marine') {
 			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"';
-			else return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		}
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->query->search[0]->title)) {
 			$fileo = $result->query->search[0]->title;
-			if (substr($fileo,-3) == 'pdf') return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (substr($fileo, -3) == 'pdf') return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 			$file = urlencode($fileo);
 			$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;
 			$data2 = $Common->getData($url2);
@@ -596,11 +596,11 @@  discard block
 block discarded – undo
 				if (isset($result2->query->pages)) {
 					foreach ($result2->query->pages as $page) {
 						if (isset($page->imageinfo[0]->extmetadata->Artist)) {
-							$image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
+							$image_url['copyright'] = preg_replace('/ from(.*)/', '', strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
 							if (isset($page->imageinfo[0]->extmetadata->License->value)) {
 								$image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')';
 							}
-							$image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright']));
+							$image_url['copyright'] = trim(str_replace('\n', '', $image_url['copyright']));
 							return $image_url;
 						}
 					}
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
 				return $image_url;
 			}
 		}
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
 	* @return array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromCustomSource($type,$registration,$name='') {
+	public function fromCustomSource($type, $registration, $name = '') {
 		global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);
 		if (!empty($globalAircraftImageCustomSources) && $type == 'aircraft') {
@@ -636,15 +636,15 @@  discard block
 block discarded – undo
 					print_r($source);
 					print_r($customsources);
 				}
-				$url = str_replace('{registration}',$registration,$source['original']);
-				$url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']);
+				$url = str_replace('{registration}', $registration, $source['original']);
+				$url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']);
 				if ($Common->urlexist($url)) {
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
 					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
 					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
+					if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright;
 					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
 					else $image_url['copyright'] = $source['source_website'];
 					$image_url['source_website'] = $source['source_website'];
@@ -652,8 +652,8 @@  discard block
 block discarded – undo
 					return $image_url;
 				}
 			}
-			return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
+		} else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 
 		if (!empty($globalMarineImageCustomSources) && $type == 'marine') {
 			$customsources = array();
@@ -669,19 +669,19 @@  discard block
 block discarded – undo
 					print_r($source);
 					print_r($customsources);
 				}
-				$url = str_replace('{registration}',$registration,$source['original']);
-				$url = str_replace('{mmsi}',$registration,$url);
-				$url = str_replace('{name}',$name,$url);
-				$url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']);
-				$url_thumbnail = str_replace('{mmsi}',$registration,$url_thumbnail);
-				$url_thumbnail = str_replace('{name}',$name,$url_thumbnail);
+				$url = str_replace('{registration}', $registration, $source['original']);
+				$url = str_replace('{mmsi}', $registration, $url);
+				$url = str_replace('{name}', $name, $url);
+				$url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']);
+				$url_thumbnail = str_replace('{mmsi}', $registration, $url_thumbnail);
+				$url_thumbnail = str_replace('{name}', $name, $url_thumbnail);
 				if ($Common->urlexist($url)) {
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
 					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
 					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
+					if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright;
 					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
 					else $image_url['copyright'] = $source['source_website'];
 					$image_url['source_website'] = $source['source_website'];

Please login to merge, or discard this patch.

Braces +223 added lines, -82 removed lines patch added patch discarded remove patch

@@ -19,7 +19,9 @@  discard block
 block discarded – undo
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Image)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Image)');
+		}
 	}
 
     /**
@@ -36,7 +38,9 @@  discard block
 block discarded – undo
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
 		$reg = $registration;
-		if (($reg == '' || $reg == 'NA') && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao;
+		if (($reg == '' || $reg == 'NA') && $aircraft_icao != '') {
+			$reg = $aircraft_icao.$airline_icao;
+		}
 		$reg = trim($reg);
 		$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 
 			FROM spotter_image 
@@ -44,9 +48,13 @@  discard block
 block discarded – undo
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $reg));
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (!empty($result)) return $result;
-		elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
-		else return array();
+		if (!empty($result)) {
+			return $result;
+		} elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) {
+			return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
+		} else {
+			return array();
+		}
 	}
 
     /**
@@ -74,7 +82,9 @@  discard block
 block discarded – undo
 			}
 		}
 		$name = trim($name);
-		if ($mmsi == '' && $imo == '' && $name == '') return array();
+		if ($mmsi == '' && $imo == '' && $name == '') {
+			return array();
+		}
 		$query  = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name 
 			FROM marine_image 
 			WHERE marine_image.mmsi = :mmsi";
@@ -103,8 +113,11 @@  discard block
 block discarded – undo
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
-		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
-		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
+		if (isset($exif['COMPUTED']['copyright'])) {
+			$copyright = $exif['COMPUTED']['copyright'];
+		} elseif (isset($exif['copyright'])) {
+			$copyright = $exif['copyright'];
+		}
 		if ($copyright != '') {
 			$copyright = str_replace('Copyright ','',$copyright);
 			$copyright = str_replace('© ','',$copyright);
@@ -124,17 +137,27 @@  discard block
 block discarded – undo
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch, $globalOffline;
-		if ((isset($globalAircraftImageFetch) && $globalAircraftImageFetch === FALSE) || (isset($globalOffline) && $globalOffline === TRUE)) return '';
+		if ((isset($globalAircraftImageFetch) && $globalAircraftImageFetch === FALSE) || (isset($globalOffline) && $globalOffline === TRUE)) {
+			return '';
+		}
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
 		$registration = trim($registration);
 		//getting the aircraft image
-		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
-		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
-		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
+		if ($globalDebug && $registration != '') {
+			echo 'Try to find an aircraft image for '.$registration.'...';
+		} elseif ($globalDebug && $aircraft_icao != '') {
+			echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
+		} elseif ($globalDebug && $airline_icao != '') {
+			echo 'Try to find an aircraft image for '.$airline_icao.'...';
+		}
 		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
-		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
+		if ($registration == '' && $aircraft_icao != '') {
+			$registration = $aircraft_icao.$airline_icao;
+		}
 		if ($image_url['original'] != '') {
-			if ($globalDebug) echo 'Found !'."\n";
+			if ($globalDebug) {
+				echo 'Found !'."\n";
+			}
 			$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)";
 			try {
 				$sth = $this->db->prepare($query);
@@ -143,7 +166,9 @@  discard block
 block discarded – undo
 				echo $e->getMessage()."\n";
 				return "error";
 			}
-		} elseif ($globalDebug) echo "Not found :'(\n";
+		} elseif ($globalDebug) {
+			echo "Not found :'(\n";
+		}
 		return "success";
 	}
 
@@ -158,7 +183,9 @@  discard block
 block discarded – undo
 	public function addMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalDebug,$globalMarineImageFetch, $globalOffline;
-		if ((isset($globalMarineImageFetch) && !$globalMarineImageFetch) || (isset($globalOffline) && $globalOffline === TRUE)) return '';
+		if ((isset($globalMarineImageFetch) && !$globalMarineImageFetch) || (isset($globalOffline) && $globalOffline === TRUE)) {
+			return '';
+		}
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
 		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
 		$name = filter_var($name,FILTER_SANITIZE_STRING);
@@ -168,16 +195,22 @@  discard block
 block discarded – undo
 			$identity = $Marine->getIdentity($mmsi);
 			if (isset($identity[0]['mmsi'])) {
 				$imo = $identity[0]['imo'];
-				if ($identity[0]['ship_name'] != '') $name = $identity[0]['ship_name'];
+				if ($identity[0]['ship_name'] != '') {
+					$name = $identity[0]['ship_name'];
+				}
 			}
 		}
 		unset($Marine);
 
 		//getting the aircraft image
-		if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...';
+		if ($globalDebug && $name != '') {
+			echo 'Try to find an vessel image for '.$name.'...';
+		}
 		$image_url = $this->findMarineImage($mmsi,$imo,$name);
 		if ($image_url['original'] != '') {
-			if ($globalDebug) echo 'Found !'."\n";
+			if ($globalDebug) {
+				echo 'Found !'."\n";
+			}
 			$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)";
 			try {
 				$sth = $this->db->prepare($query);
@@ -186,7 +219,9 @@  discard block
 block discarded – undo
 				echo $e->getMessage()."\n";
 				return "error";
 			}
-		} elseif ($globalDebug) echo "Not found :'(\n";
+		} elseif ($globalDebug) {
+			echo "Not found :'(\n";
+		}
 		return "success";
 	}
 
@@ -202,41 +237,85 @@  discard block
 block discarded – undo
 	{
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
+		if (!isset($globalIVAO)) {
+			$globalIVAO = FALSE;
+		}
 		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
 		if ($aircraft_registration != '' && $aircraft_registration != 'NA' && (!isset($globalVA) || $globalVA !== TRUE)) {
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (strpos($aircraft_registration,'/') !== false) {
+				return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			}
 			$aircraft_registration = urlencode(trim($aircraft_registration));
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
-			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
-			else $aircraft_name = '';
-			if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
-			else $aircraft_icao = '';
-			if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
-			else $airline_icao = '';
+			if (isset($aircraft_info[0]['aircraft_name'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_name'];
+			} else {
+				$aircraft_name = '';
+			}
+			if (isset($aircraft_info[0]['aircraft_icao'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_icao'];
+			} else {
+				$aircraft_icao = '';
+			}
+			if (isset($aircraft_info[0]['airline_icao'])) {
+				$airline_icao = $aircraft_info[0]['airline_icao'];
+			} else {
+				$airline_icao = '';
+			}
 		} elseif ($aircraft_icao != '') {
 			$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao);
-			if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type'];
-			else $aircraft_name = '';
+			if (isset($aircraft_info[0]['type'])) {
+				$aircraft_name = $aircraft_info[0]['type'];
+			} else {
+				$aircraft_name = '';
+			}
 			$aircraft_registration = $aircraft_icao;
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		} else {
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		}
 		unset($Spotter);
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		if (!isset($globalAircraftImageSources)) {
+			$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		}
 		foreach ($globalAircraftImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
-			if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_icao,$aircraft_name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
-		}
-		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao);
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') {
+				$images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
+			}
+			if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) {
+				$images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'flickr' && extension_loaded('simplexml')) {
+				$images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'bing') {
+				$images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'deviantart' && extension_loaded('simplexml')) {
+				$images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'wikimedia') {
+				$images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) {
+				$images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) {
+				$images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'airportdata' && !$globalIVAO) {
+				$images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_icao,$aircraft_name);
+			}
+			if ($source == 'customsources') {
+				$images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if (isset($images_array) && $images_array['original'] != '') {
+				return $images_array;
+			}
+		}
+		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) {
+			return $this->findAircraftImage($aircraft_icao);
+		}
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
 
@@ -256,7 +335,9 @@  discard block
 block discarded – undo
 		//$imo = filter_var($imo,FILTER_SANITIZE_STRING);
 		$name = filter_var($name,FILTER_SANITIZE_STRING);
 		$name = trim($name);
-		if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		if (strlen($name) < 4) {
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		}
 		/*
 		$Marine = new Marine($this->db);
 		if ($imo == '' || $name == '') {
@@ -268,15 +349,29 @@  discard block
 block discarded – undo
 		}
 		unset($Marine);
 		*/
-		if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
+		if (!isset($globalMarineImageSources)) {
+			$globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
+		}
 		foreach ($globalMarineImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name);
-			if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name);
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
+			if ($source == 'flickr') {
+				$images_array = $this->fromFlickr('marine',$mmsi,$name);
+			}
+			if ($source == 'bing') {
+				$images_array = $this->fromBing('marine',$mmsi,$name);
+			}
+			if ($source == 'deviantart') {
+				$images_array = $this->fromDeviantart('marine',$mmsi,$name);
+			}
+			if ($source == 'wikimedia') {
+				$images_array = $this->fromWikimedia('marine',$mmsi,$name);
+			}
+			if ($source == 'customsources') {
+				$images_array = $this->fromCustomSource('marine',$mmsi,$name);
+			}
+			if (isset($images_array) && $images_array['original'] != '') {
+				return $images_array;
+			}
 		}
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
@@ -299,7 +394,9 @@  discard block
 block discarded – undo
 			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		if (substr($data, 0, 5) != "<?xml") {
+			return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		}
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
 				$image_url = array();
@@ -338,7 +435,9 @@  discard block
 block discarded – undo
 			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"';
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		if (substr($data, 0, 5) != "<?xml") {
+			return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		}
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item->link)) {
 				$image_url = array();
@@ -442,14 +541,22 @@  discard block
 block discarded – undo
 	public function fromFlickr($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
-			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);
-			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';
+			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);
+			} 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';
+			}
 		} elseif ($type == 'marine') {
-			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);
-			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';
+			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);
+			} 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';
+			}
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		if (substr($data, 0, 5) != "<?xml") {
+			return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		}
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
 				$original_url = trim((string)$xml->channel->item->enclosure->attributes()->url);
@@ -498,13 +605,21 @@  discard block
 block discarded – undo
 	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
-		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		if (!isset($globalImageBingKey) || $globalImageBingKey == '') {
+			return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		}
 		if ($type == 'aircraft') {
-			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';
-			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';
+			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';
+			} 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';
+			}
 		} elseif ($type == 'marine') {
-			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';
-			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';
+			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';
+			} 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';
+			}
 		}
 		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
 		$data = $Common->getData($url,'get','',$headers);
@@ -561,17 +676,25 @@  discard block
 block discarded – undo
 	public function fromWikimedia($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
-			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);
-			else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
+			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);
+			} else {
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
+			}
 		} elseif ($type == 'marine') {
-			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"';
-			else return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			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"';
+			} else {
+				return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			}
 		}
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->query->search[0]->title)) {
 			$fileo = $result->query->search[0]->title;
-			if (substr($fileo,-3) == 'pdf') return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (substr($fileo,-3) == 'pdf') {
+				return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			}
 			$file = urlencode($fileo);
 			$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;
 			$data2 = $Common->getData($url2);
@@ -642,18 +765,27 @@  discard block
 block discarded – undo
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
-					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
-					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
-					else $image_url['copyright'] = $source['source_website'];
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
+						$exifCopyright = $this->getExifCopyright($url);
+					} else {
+						$exifCopyright = '';
+					}
+					if ($exifCopyright  != '') {
+						$image_url['copyright'] = $exifCopyright;
+					} elseif (isset($source['copyright'])) {
+						$image_url['copyright'] = $source['copyright'];
+					} else {
+						$image_url['copyright'] = $source['source_website'];
+					}
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];
 					return $image_url;
 				}
 			}
 			return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		} else {
+			return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		}
 
 		if (!empty($globalMarineImageCustomSources) && $type == 'marine') {
 			$customsources = array();
@@ -679,18 +811,27 @@  discard block
 block discarded – undo
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
-					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
-					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
-					else $image_url['copyright'] = $source['source_website'];
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
+						$exifCopyright = $this->getExifCopyright($url);
+					} else {
+						$exifCopyright = '';
+					}
+					if ($exifCopyright  != '') {
+						$image_url['copyright'] = $exifCopyright;
+					} elseif (isset($source['copyright'])) {
+						$image_url['copyright'] = $source['copyright'];
+					} else {
+						$image_url['copyright'] = $source['source_website'];
+					}
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];
 					return $image_url;
 				}
 			}
 			return false;
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 }
 

Please login to merge, or discard this patch.

		@@ -286,6 +286,7 @@ discard block
		block discarded – undo
286	286	*
287	287	* @param String $aircraft_registration the registration of the aircraft
288	288	* @param String $aircraft_name type of the aircraft
	289	+ * @param string $type
289	290	* @return array the aircraft thumbnail, orignal url and copyright
290	291	*
291	292	*/
		@@ -318,7 +319,7 @@ discard block
		block discarded – undo
318	319	/**
319	320	* Gets the aircraft image from Deviantart
320	321	*
321		- * @param $type
	322	+ * @param string $type
322	323	* @param String $registration the registration of the aircraft
323	324	* @param String $name type of the aircraft
324	325	* @return array the aircraft thumbnail, orignal url and copyright
		@@ -360,6 +361,7 @@ discard block
		block discarded – undo
360	361	*
361	362	* @param String $aircraft_registration the registration of the aircraft
362	363	* @param String $aircraft_name type of the aircraft
	364	+ * @param string $type
363	365	* @return array the aircraft thumbnail, orignal url and copyright
364	366	*
365	367	*/
		@@ -402,6 +404,7 @@ discard block
		block discarded – undo
402	404	*
403	405	* @param String $aircraft_registration the registration of the aircraft
404	406	* @param String $aircraft_name type of the aircraft
	407	+ * @param string $type
405	408	* @return array the aircraft thumbnail, orignal url and copyright
406	409	*
407	410	*/
		@@ -436,6 +439,7 @@ discard block
		block discarded – undo
436	439	*
437	440	* @param String $registration the registration of the aircraft
438	441	* @param String $name type of the aircraft
	442	+ * @param string $type
439	443	* @return array the aircraft thumbnail, orignal url and copyright
440	444	*
441	445	*/
		@@ -466,8 +470,8 @@ discard block
		block discarded – undo
466	470	}
467	471
468	472	/**
469		- * @param $type
470		- * @param $aircraft_icao
	473	+ * @param string $type
	474	+ * @param string $aircraft_icao
471	475	* @param $airline_icao
472	476	* @return array
473	477	*/
		@@ -490,7 +494,7 @@ discard block
		block discarded – undo
490	494	/**
491	495	* Gets the aircraft image from Bing
492	496	*
493		- * @param $type
	497	+ * @param string $type
494	498	* @param String $aircraft_registration the registration of the aircraft
495	499	* @param String $aircraft_name type of the aircraft
496	500	* @return array the aircraft thumbnail, orignal url and copyright
		@@ -530,6 +534,7 @@ discard block
		block discarded – undo
530	534	* @param String $aircraft_registration the registration of the aircraft
531	535	* @param String $aircraft_icao the icao code of the aircraft
532	536	* @param String $aircraft_name type of the aircraft
	537	+ * @param string $type
533	538	* @return array the aircraft thumbnail, orignal url and copyright
534	539	*
535	540	*/
		@@ -555,6 +560,7 @@ discard block
		block discarded – undo
555	560	*
556	561	* @param String $registration the registration of the aircraft/mmsi
557	562	* @param String $name name
	563	+ * @param string $type
558	564	* @return array the aircraft thumbnail, orignal url and copyright
559	565	*
560	566	*/
		@@ -616,6 +622,7 @@ discard block
		block discarded – undo
616	622	*
617	623	* @param String $registration the registration of the aircraft
618	624	* @param String $name type of the aircraft
	625	+ * @param string $type
619	626	* @return array the aircraft thumbnail, orignal url and copyright
620	627	*
621	628	*/

		@@ -22,14 +22,14 @@ discard block
		block discarded – undo
22	22	if ($this->db === null) die('Error: No DB connection. (Image)');
23	23	}
24	24
25		- /**
26		- * Gets the images based on the aircraft registration
27		- *
28		- * @param $registration
29		- * @param string $aircraft_icao
30		- * @param string $airline_icao
31		- * @return array the images list
32		- */
	25	+ /**
	26	+ * Gets the images based on the aircraft registration
	27	+ *
	28	+ * @param $registration
	29	+ * @param string $aircraft_icao
	30	+ * @param string $airline_icao
	31	+ * @return array the images list
	32	+ */
33	33	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
34	34	{
35	35	$registration = filter_var($registration,FILTER_SANITIZE_STRING);
		@@ -49,15 +49,15 @@ discard block
		block discarded – undo
49	49	else return array();
50	50	}
51	51
52		- /**
53		- * Gets the images based on the ship name
54		- *
55		- * @param $mmsi
56		- * @param string $imo
57		- * @param string $name
58		- * @param string $type_name
59		- * @return array the images list
60		- */
	52	+ /**
	53	+ * Gets the images based on the ship name
	54	+ *
	55	+ * @param $mmsi
	56	+ * @param string $imo
	57	+ * @param string $name
	58	+ * @param string $type_name
	59	+ * @return array the images list
	60	+ */
61	61	public function getMarineImage($mmsi,$imo = '',$name = '',$type_name = '')
62	62	{
63	63	global $globalMarineImagePics;
		@@ -94,12 +94,12 @@ discard block
		block discarded – undo
94	94	return $result;
95	95	}
96	96
97		- /**
98		- * Gets the image copyright based on the Exif data
99		- *
100		- * @param $url
101		- * @return String image copyright
102		- */
	97	+ /**
	98	+ * Gets the image copyright based on the Exif data
	99	+ *
	100	+ * @param $url
	101	+ * @return String image copyright
	102	+ */
103	103	public function getExifCopyright($url) {
104	104	$exif = exif_read_data($url);
105	105	$copyright = '';
		@@ -113,14 +113,14 @@ discard block
		block discarded – undo
113	113	return $copyright;
114	114	}
115	115
116		- /**
117		- * Adds the images based on the aircraft registration
118		- *
119		- * @param $registration
120		- * @param string $aircraft_icao
121		- * @param string $airline_icao
122		- * @return String either success or error
123		- */
	116	+ /**
	117	+ * Adds the images based on the aircraft registration
	118	+ *
	119	+ * @param $registration
	120	+ * @param string $aircraft_icao
	121	+ * @param string $airline_icao
	122	+ * @return String either success or error
	123	+ */
124	124	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
125	125	{
126	126	global $globalDebug,$globalAircraftImageFetch, $globalOffline;
		@@ -147,14 +147,14 @@ discard block
		block discarded – undo
147	147	return "success";
148	148	}
149	149
150		- /**
151		- * Adds the images based on the marine name
152		- *
153		- * @param $mmsi
154		- * @param string $imo
155		- * @param string $name
156		- * @return String either success or error
157		- */
	150	+ /**
	151	+ * Adds the images based on the marine name
	152	+ *
	153	+ * @param $mmsi
	154	+ * @param string $imo
	155	+ * @param string $name
	156	+ * @return String either success or error
	157	+ */
158	158	public function addMarineImage($mmsi,$imo = '',$name = '')
159	159	{
160	160	global $globalDebug,$globalMarineImageFetch, $globalOffline;
		@@ -190,14 +190,14 @@ discard block
		block discarded – undo
190	190	return "success";
191	191	}
192	192
193		- /**
194		- * Gets the aircraft image
195		- *
196		- * @param String $aircraft_registration the registration of the aircraft
197		- * @param string $aircraft_icao
198		- * @param string $airline_icao
199		- * @return array the aircraft thumbnail, orignal url and copyright
200		- */
	193	+ /**
	194	+ * Gets the aircraft image
	195	+ *
	196	+ * @param String $aircraft_registration the registration of the aircraft
	197	+ * @param string $aircraft_icao
	198	+ * @param string $airline_icao
	199	+ * @return array the aircraft thumbnail, orignal url and copyright
	200	+ */
201	201	public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '')
202	202	{
203	203	global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
		@@ -241,14 +241,14 @@ discard block
		block discarded – undo
241	241	}
242	242
243	243	/**
244		- * Gets the vessel image
245		- *
246		- * @param String $mmsi the vessel mmsi
247		- * @param String $imo the vessel imo
248		- * @param String $name the vessel name
249		- * @return array the aircraft thumbnail, orignal url and copyright
250		- *
251		- */
	244	+ * Gets the vessel image
	245	+ *
	246	+ * @param String $mmsi the vessel mmsi
	247	+ * @param String $imo the vessel imo
	248	+ * @param String $name the vessel name
	249	+ * @return array the aircraft thumbnail, orignal url and copyright
	250	+ *
	251	+ */
252	252	public function findMarineImage($mmsi,$imo = '',$name = '')
253	253	{
254	254	global $globalMarineImageSources;
		@@ -282,13 +282,13 @@ discard block
		block discarded – undo
282	282	}
283	283
284	284	/**
285		- * Gets the aircraft image from Planespotters
286		- *
287		- * @param String $aircraft_registration the registration of the aircraft
288		- * @param String $aircraft_name type of the aircraft
289		- * @return array the aircraft thumbnail, orignal url and copyright
290		- *
291		- */
	285	+ * Gets the aircraft image from Planespotters
	286	+ *
	287	+ * @param String $aircraft_registration the registration of the aircraft
	288	+ * @param String $aircraft_name type of the aircraft
	289	+ * @return array the aircraft thumbnail, orignal url and copyright
	290	+ *
	291	+ */
292	292	public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') {
293	293	$Common = new Common();
294	294	// If aircraft registration is only number, also check with aircraft model
		@@ -315,14 +315,14 @@ discard block
		block discarded – undo
315	315	return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
316	316	}
317	317
318		- /**
319		- * Gets the aircraft image from Deviantart
320		- *
321		- * @param $type
322		- * @param String $registration the registration of the aircraft
323		- * @param String $name type of the aircraft
324		- * @return array the aircraft thumbnail, orignal url and copyright
325		- */
	318	+ /**
	319	+ * Gets the aircraft image from Deviantart
	320	+ *
	321	+ * @param $type
	322	+ * @param String $registration the registration of the aircraft
	323	+ * @param String $name type of the aircraft
	324	+ * @return array the aircraft thumbnail, orignal url and copyright
	325	+ */
326	326	public function fromDeviantart($type,$registration, $name='') {
327	327	$Common = new Common();
328	328	if ($type == 'aircraft') {
		@@ -356,13 +356,13 @@ discard block
		block discarded – undo
356	356	}
357	357
358	358	/**
359		- * Gets the aircraft image from JetPhotos
360		- *
361		- * @param String $aircraft_registration the registration of the aircraft
362		- * @param String $aircraft_name type of the aircraft
363		- * @return array the aircraft thumbnail, orignal url and copyright
364		- *
365		- */
	359	+ * Gets the aircraft image from JetPhotos
	360	+ *
	361	+ * @param String $aircraft_registration the registration of the aircraft
	362	+ * @param String $aircraft_name type of the aircraft
	363	+ * @return array the aircraft thumbnail, orignal url and copyright
	364	+ *
	365	+ */
366	366	public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') {
367	367	$Common = new Common();
368	368	$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
		@@ -398,13 +398,13 @@ discard block
		block discarded – undo
398	398	}
399	399
400	400	/**
401		- * Gets the aircraft image from PlanePictures
402		- *
403		- * @param String $aircraft_registration the registration of the aircraft
404		- * @param String $aircraft_name type of the aircraft
405		- * @return array the aircraft thumbnail, orignal url and copyright
406		- *
407		- */
	401	+ * Gets the aircraft image from PlanePictures
	402	+ *
	403	+ * @param String $aircraft_registration the registration of the aircraft
	404	+ * @param String $aircraft_name type of the aircraft
	405	+ * @return array the aircraft thumbnail, orignal url and copyright
	406	+ *
	407	+ */
408	408	public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') {
409	409	$Common = new Common();
410	410	$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
		@@ -432,13 +432,13 @@ discard block
		block discarded – undo
432	432	}
433	433
434	434	/**
435		- * Gets the aircraft image from Flickr
436		- *
437		- * @param String $registration the registration of the aircraft
438		- * @param String $name type of the aircraft
439		- * @return array the aircraft thumbnail, orignal url and copyright
440		- *
441		- */
	435	+ * Gets the aircraft image from Flickr
	436	+ *
	437	+ * @param String $registration the registration of the aircraft
	438	+ * @param String $name type of the aircraft
	439	+ * @return array the aircraft thumbnail, orignal url and copyright
	440	+ *
	441	+ */
442	442	public function fromFlickr($type,$registration,$name='') {
443	443	$Common = new Common();
444	444	if ($type == 'aircraft') {
		@@ -465,13 +465,13 @@ discard block
		block discarded – undo
465	465	return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
466	466	}
467	467
468		- /**
469		- * @param $type
470		- * @param $aircraft_icao
471		- * @param $airline_icao
472		- * @return array
473		- */
474		- public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) {
	468	+ /**
	469	+ * @param $type
	470	+ * @param $aircraft_icao
	471	+ * @param $airline_icao
	472	+ * @return array
	473	+ */
	474	+ public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) {
475	475	$Common = new Common();
476	476	//echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
477	477	if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) {
		@@ -487,14 +487,14 @@ discard block
		block discarded – undo
487	487	}
488	488	}
489	489
490		- /**
491		- * Gets the aircraft image from Bing
492		- *
493		- * @param $type
494		- * @param String $aircraft_registration the registration of the aircraft
495		- * @param String $aircraft_name type of the aircraft
496		- * @return array the aircraft thumbnail, orignal url and copyright
497		- */
	490	+ /**
	491	+ * Gets the aircraft image from Bing
	492	+ *
	493	+ * @param $type
	494	+ * @param String $aircraft_registration the registration of the aircraft
	495	+ * @param String $aircraft_name type of the aircraft
	496	+ * @return array the aircraft thumbnail, orignal url and copyright
	497	+ */
498	498	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
499	499	global $globalImageBingKey;
500	500	$Common = new Common();
		@@ -525,14 +525,14 @@ discard block
		block discarded – undo
525	525	}
526	526
527	527	/**
528		- * Gets the aircraft image from airport-data
529		- *
530		- * @param String $aircraft_registration the registration of the aircraft
531		- * @param String $aircraft_icao the icao code of the aircraft
532		- * @param String $aircraft_name type of the aircraft
533		- * @return array the aircraft thumbnail, orignal url and copyright
534		- *
535		- */
	528	+ * Gets the aircraft image from airport-data
	529	+ *
	530	+ * @param String $aircraft_registration the registration of the aircraft
	531	+ * @param String $aircraft_icao the icao code of the aircraft
	532	+ * @param String $aircraft_name type of the aircraft
	533	+ * @return array the aircraft thumbnail, orignal url and copyright
	534	+ *
	535	+ */
536	536	public function fromAirportData($type,$aircraft_registration,$aircraft_icao,$aircraft_name='') {
537	537	$Common = new Common();
538	538	$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration.'&m='.$aircraft_icao;
		@@ -551,13 +551,13 @@ discard block
		block discarded – undo
551	551	}
552	552
553	553	/**
554		- * Gets image from WikiMedia
555		- *
556		- * @param String $registration the registration of the aircraft/mmsi
557		- * @param String $name name
558		- * @return array the aircraft thumbnail, orignal url and copyright
559		- *
560		- */
	554	+ * Gets image from WikiMedia
	555	+ *
	556	+ * @param String $registration the registration of the aircraft/mmsi
	557	+ * @param String $name name
	558	+ * @return array the aircraft thumbnail, orignal url and copyright
	559	+ *
	560	+ */
561	561	public function fromWikimedia($type,$registration,$name='') {
562	562	$Common = new Common();
563	563	if ($type == 'aircraft') {
		@@ -612,13 +612,13 @@ discard block
		block discarded – undo
612	612	}
613	613
614	614	/**
615		- * Gets the aircraft image from custom url
616		- *
617		- * @param String $registration the registration of the aircraft
618		- * @param String $name type of the aircraft
619		- * @return array the aircraft thumbnail, orignal url and copyright
620		- *
621		- */
	615	+ * Gets the aircraft image from custom url
	616	+ *
	617	+ * @param String $registration the registration of the aircraft
	618	+ * @param String $name type of the aircraft
	619	+ * @return array the aircraft thumbnail, orignal url and copyright
	620	+ *
	621	+ */
622	622	public function fromCustomSource($type,$registration,$name='') {
623	623	global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug;
624	624	//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);

Ysurac / FlightAirMap

Push — master ( 75f113...b78c73 )

Status

Category

Doc Comments +11 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

Spacing +131 added lines, -131 removed lines patch added patch discarded remove patch

Braces +223 added lines, -82 removed lines patch added patch discarded remove patch