Ysurac / FlightAirMap

require/class.Image.php

Doc Comments +11 added lines, -4 removed lines

@@ -286,6 +286,7 @@ 
 	*
 	* @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 @@ 
     /**
      * 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 @@ 
 	*
 	* @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 @@ 
 	*
 	* @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 @@ 
 	*
 	* @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 @@ 
 	}
 
     /**
-     * @param $type
-     * @param $aircraft_icao
+     * @param string $type
+     * @param string $aircraft_icao
      * @param $airline_icao
      * @return array
      */
@@ -490,7 +494,7 @@ 
     /**
      * 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 @@ 
 	* @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 @@ 
 	*
 	* @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 @@ 
 	*
 	* @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
 	*
 	*/

Indentation +128 added lines, -128 removed lines

@@ -22,14 +22,14 @@ 
 		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 @@ 
 		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 @@ 
 		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 @@ 
 		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 @@ 
 		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 @@ 
 		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 @@ 
 	}
 
 	/**
-	* 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 @@ 
 	}
 
 	/**
-	* 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 @@ 
 		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 @@ 
 	}
 
 	/**
-	* 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 @@ 
 	}
 
 	/**
-	* 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 @@ 
 	}
 
 	/**
-	* 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 @@ 
 		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 @@ 
 		}
 	}
 
-    /**
-     * 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 @@ 
 	}
 
 	/**
-	* 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 @@ 
 	}
 
 	/**
-	* 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 @@ 
 	}
 
 	/**
-	* 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);