X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FImage.php;h=972b48359f6d51b918b46605ed1f236c58a92b76;hb=fd706cf9a7a0c4700838a1f00b12d8fd37323b7c;hp=7cbc2432d995ecf2f4352b4eb80bcdc3c6d7349d;hpb=394e94cbc1b3a11e50cd6b076582403d62839c86;p=friendica.git

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 7cbc2432d9..972b48359f 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -5,23 +5,19 @@
  */
 namespace Friendica\Object;
 
-use Friendica\App;
-use Friendica\Core\Cache;
+use Exception;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Model\Photo;
-use Exception;
+use Friendica\Util\Images;
 use Imagick;
 use ImagickPixel;
 
-require_once "include/photos.php";
-
 /**
  * Class to handle images
  */
 class Image
 {
+	/** @var Imagick|resource */
 	private $image;
 
 	/*
@@ -34,43 +30,19 @@ class Image
 	private $type;
 	private $types;
 
-	/**
-	 * @brief supported mimetypes and corresponding file extensions
-	 * @return array
-	 */
-	public static function supportedTypes()
-	{
-		if (class_exists('Imagick')) {
-			// Imagick::queryFormats won't help us a lot there...
-			// At least, not yet, other parts of friendica uses this array
-			$t = array(
-				'image/jpeg' => 'jpg',
-				'image/png' => 'png',
-				'image/gif' => 'gif'
-			);
-		} else {
-			$t = array();
-			$t['image/jpeg'] ='jpg';
-			if (imagetypes() & IMG_PNG) {
-				$t['image/png'] = 'png';
-			}
-		}
-
-		return $t;
-	}
-
 	/**
 	 * @brief Constructor
-	 * @param object  $data data
+	 * @param string  $data
 	 * @param boolean $type optional, default null
-	 * @return object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public function __construct($data, $type = null)
 	{
 		$this->imagick = class_exists('Imagick');
-		$this->types = static::supportedTypes();
+		$this->types = Images::supportedTypes();
 		if (!array_key_exists($type, $this->types)) {
-			$type='image/jpeg';
+			$type = 'image/jpeg';
 		}
 		$this->type = $type;
 
@@ -110,22 +82,10 @@ class Image
 	}
 
 	/**
-	 * @brief Maps Mime types to Imagick formats
-	 * @return array With with image formats (mime type as key)
-	 */
-	public static function getFormatsMap()
-	{
-		$m = array(
-			'image/jpeg' => 'JPG',
-			'image/png' => 'PNG',
-			'image/gif' => 'GIF'
-		);
-		return $m;
-	}
-
-	/**
-	 * @param object $data data
+	 * @param string $data data
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private function loadData($data)
 	{
@@ -141,7 +101,7 @@ class Image
 			/*
 			 * Setup the image to the format it will be saved to
 			 */
-			$map = self::getFormatsMap();
+			$map = Images::getFormatsMap();
 			$format = $map[$this->type];
 			$this->image->setFormat($format);
 
@@ -294,8 +254,6 @@ class Image
 		$width = $this->getWidth();
 		$height = $this->getHeight();
 
-		$dest_width = $dest_height = 0;
-
 		if ((! $width)|| (! $height)) {
 			return false;
 		}
@@ -444,7 +402,7 @@ class Image
 			return;
 		}
 
-		$ort = $exif['IFD0']['Orientation'];
+		$ort = isset($exif['IFD0']['Orientation']) ? $exif['IFD0']['Orientation'] : 1;
 
 		switch ($ort) {
 			case 1: // nothing
@@ -481,7 +439,7 @@ class Image
 				break;
 		}
 
-		//	logger('exif: ' . print_r($exif,true));
+		//	Logger::log('exif: ' . print_r($exif,true));
 		return $exif;
 	}
 
@@ -498,8 +456,6 @@ class Image
 		$width = $this->getWidth();
 		$height = $this->getHeight();
 
-		$dest_width = $dest_height = 0;
-
 		if ((!$width)|| (!$height)) {
 			return false;
 		}
@@ -641,6 +597,7 @@ class Image
 	/**
 	 * @param string $path file path
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function saveToFilePath($path)
 	{
@@ -650,11 +607,11 @@ class Image
 
 		$string = $this->asString();
 
-		$a = get_app();
+		$a = \get_app();
 
 		$stamp1 = microtime(true);
 		file_put_contents($path, $string);
-		$a->save_timestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 	}
 
 	/**
@@ -665,6 +622,7 @@ class Image
 	 * $data = (string) $Image;
 	 *
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function __toString() {
 		return $this->asString();
@@ -672,6 +630,7 @@ class Image
 
 	/**
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function asString()
 	{
@@ -686,8 +645,6 @@ class Image
 			return $string;
 		}
 
-		$quality = false;
-
 		ob_start();
 
 		// Enable interlacing
@@ -714,91 +671,51 @@ class Image
 		return $string;
 	}
 
+	/**
+	 * @brief supported mimetypes and corresponding file extensions
+	 * @return array
+	 * @deprecated in version 2019.12 please use Util\Images::supportedTypes() instead.
+	 */
+	public static function supportedTypes()
+	{
+		return Images::supportedTypes();
+	}
+
+	/**
+	 * @brief Maps Mime types to Imagick formats
+	 * @return array With with image formats (mime type as key)
+	 * @deprecated in version 2019.12 please use Util\Images::getFormatsMap() instead.
+	 */
+	public static function getFormatsMap()
+	{
+		return Images::getFormatsMap();
+	}
+
 	/**
 	 * Guess image mimetype from filename or from Content-Type header
 	 *
 	 * @param string  $filename Image filename
 	 * @param boolean $fromcurl Check Content-Type header from curl request
+	 * @param string  $header   passed headers to take into account
 	 *
-	 * @return object
+	 * @return string|null
+	 * @throws Exception
+	 * @deprecated in version 2019.12 please use Util\Images::guessType() instead.
 	 */
-	public static function guessType($filename, $fromcurl = false)
+	public static function guessType($filename, $fromcurl = false, $header = '')
 	{
-		logger('Image: guessType: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
-		$type = null;
-		if ($fromcurl) {
-			$a = get_app();
-			$headers=array();
-			$h = explode("\n", $a->get_curl_headers());
-			foreach ($h as $l) {
-				list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-				$headers[$k] = $v;
-			}
-			if (array_key_exists('Content-Type', $headers))
-				$type = $headers['Content-Type'];
-		}
-		if (is_null($type)) {
-			// Guessing from extension? Isn't that... dangerous?
-			if (class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
-				/**
-				 * Well, this not much better,
-				 * but at least it comes from the data inside the image,
-				 * we won't be tricked by a manipulated extension
-				 */
-				$image = new Imagick($filename);
-				$type = $image->getImageMimeType();
-				$image->setInterlaceScheme(Imagick::INTERLACE_PLANE);
-			} else {
-				$ext = pathinfo($filename, PATHINFO_EXTENSION);
-				$types = self::supportedTypes();
-				$type = "image/jpeg";
-				foreach ($types as $m => $e) {
-					if ($ext == $e) {
-						$type = $m;
-					}
-				}
-			}
-		}
-		logger('Image: guessType: type='.$type, LOGGER_DEBUG);
-		return $type;
+		return Images::guessType($filename, $fromcurl, $header);
 	}
 
 	/**
 	 * @param string $url url
-	 * @return object
+	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @deprecated in version 2019.12 please use Util\Images::getInfoFromURLCached() instead.
 	 */
 	public static function getInfoFromURL($url)
 	{
-		$data = array();
-
-		$data = Cache::get($url);
-
-		if (is_null($data) || !$data || !is_array($data)) {
-			$img_str = fetch_url($url, true, $redirects, 4);
-			$filesize = strlen($img_str);
-
-			if (function_exists("getimagesizefromstring")) {
-				$data = getimagesizefromstring($img_str);
-			} else {
-				$tempfile = tempnam(get_temppath(), "cache");
-
-				$a = get_app();
-				$stamp1 = microtime(true);
-				file_put_contents($tempfile, $img_str);
-				$a->save_timestamp($stamp1, "file");
-
-				$data = getimagesize($tempfile);
-				unlink($tempfile);
-			}
-
-			if ($data) {
-				$data["size"] = $filesize;
-			}
-
-			Cache::set($url, $data);
-		}
-
-		return $data;
+		return Images::getInfoFromURLCached($url);
 	}
 
 	/**
@@ -806,216 +723,10 @@ class Image
 	 * @param integer $height height
 	 * @param integer $max    max
 	 * @return array
+	 * @deprecated in version 2019.12 please use Util\Images::getScalingDimensions() instead.
 	 */
 	public static function getScalingDimensions($width, $height, $max)
 	{
-		$dest_width = $dest_height = 0;
-
-		if ((!$width) || (!$height)) {
-			return false;
-		}
-
-		if ($width > $max && $height > $max) {
-			// very tall image (greater than 16:9)
-			// constrain the width - let the height float.
-
-			if ((($height * 9) / 16) > $width) {
-				$dest_width = $max;
-				$dest_height = intval(($height * $max) / $width);
-			} elseif ($width > $height) {
-				// else constrain both dimensions
-				$dest_width = $max;
-				$dest_height = intval(($height * $max) / $width);
-			} else {
-				$dest_width = intval(($width * $max) / $height);
-				$dest_height = $max;
-			}
-		} else {
-			if ($width > $max) {
-				$dest_width = $max;
-				$dest_height = intval(($height * $max) / $width);
-			} else {
-				if ($height > $max) {
-					// very tall image (greater than 16:9)
-					// but width is OK - don't do anything
-
-					if ((($height * 9) / 16) > $width) {
-						$dest_width = $width;
-						$dest_height = $height;
-					} else {
-						$dest_width = intval(($width * $max) / $height);
-						$dest_height = $max;
-					}
-				} else {
-					$dest_width = $width;
-					$dest_height = $height;
-				}
-			}
-		}
-		return array("width" => $dest_width, "height" => $dest_height);
-	}
-
-	/**
-	 * @brief This function is used by the fromgplus addon
-	 * @param object  $a         App
-	 * @param integer $uid       user id
-	 * @param string  $imagedata optional, default empty
-	 * @param string  $url       optional, default empty
-	 * @return array
-	 */
-	public static function storePhoto(App $a, $uid, $imagedata = "", $url = "")
-	{
-		$r = q(
-			"SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
-			WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
-			intval($uid)
-		);
-
-		if (!DBM::is_result($r)) {
-			logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
-			return(array());
-		}
-
-		$page_owner_nick  = $r[0]['nickname'];
-
-		/// @TODO
-		/// $default_cid      = $r[0]['id'];
-		/// $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
-
-		if ((strlen($imagedata) == 0) && ($url == "")) {
-			logger("No image data and no url provided", LOGGER_DEBUG);
-			return(array());
-		} elseif (strlen($imagedata) == 0) {
-			logger("Uploading picture from ".$url, LOGGER_DEBUG);
-
-			$stamp1 = microtime(true);
-			$imagedata = @file_get_contents($url);
-			$a->save_timestamp($stamp1, "file");
-		}
-
-		$maximagesize = Config::get('system', 'maximagesize');
-
-		if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
-			logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
-			return(array());
-		}
-
-		$tempfile = tempnam(get_temppath(), "cache");
-
-		$stamp1 = microtime(true);
-		file_put_contents($tempfile, $imagedata);
-		$a->save_timestamp($stamp1, "file");
-
-		$data = getimagesize($tempfile);
-
-		if (!isset($data["mime"])) {
-			unlink($tempfile);
-			logger("File is no picture", LOGGER_DEBUG);
-			return(array());
-		}
-
-		$Image = new Image($imagedata, $data["mime"]);
-
-		if (!$Image->isValid()) {
-			unlink($tempfile);
-			logger("Picture is no valid picture", LOGGER_DEBUG);
-			return(array());
-		}
-
-		$Image->orient($tempfile);
-		unlink($tempfile);
-
-		$max_length = Config::get('system', 'max_image_length');
-		if (! $max_length) {
-			$max_length = MAX_IMAGE_LENGTH;
-		}
-
-		if ($max_length > 0) {
-			$Image->scaleDown($max_length);
-		}
-
-		$width = $Image->getWidth();
-		$height = $Image->getHeight();
-
-		$hash = photo_new_resource();
-
-		$smallest = 0;
-
-		// Pictures are always public by now
-		//$defperm = '<'.$default_cid.'>';
-		$defperm = "";
-		$visitor = 0;
-
-		$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm);
-
-		if (!$r) {
-			logger("Picture couldn't be stored", LOGGER_DEBUG);
-			return(array());
-		}
-
-		$image = array("page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
-			"full" => System::baseUrl()."/photo/{$hash}-0.".$Image->getExt());
-
-		if ($width > 800 || $height > 800) {
-			$image["large"] = System::baseUrl()."/photo/{$hash}-0.".$Image->getExt();
-		}
-
-		if ($width > 640 || $height > 640) {
-			$Image->scaleDown(640);
-			$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm);
-			if ($r) {
-				$image["medium"] = System::baseUrl()."/photo/{$hash}-1.".$Image->getExt();
-			}
-		}
-
-		if ($width > 320 || $height > 320) {
-			$Image->scaleDown(320);
-			$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
-			if ($r) {
-				$image["small"] = System::baseUrl()."/photo/{$hash}-2.".$Image->getExt();
-			}
-		}
-
-		if ($width > 160 && $height > 160) {
-			$x = 0;
-			$y = 0;
-
-			$min = $Image->getWidth();
-			if ($min > 160) {
-				$x = ($min - 160) / 2;
-			}
-
-			if ($Image->getHeight() < $min) {
-				$min = $Image->getHeight();
-				if ($min > 160) {
-					$y = ($min - 160) / 2;
-				}
-			}
-
-			$min = 160;
-			$Image->crop(160, $x, $y, $min, $min);
-
-			$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
-			if ($r) {
-				$image["thumb"] = System::baseUrl()."/photo/{$hash}-3.".$Image->getExt();
-			}
-		}
-
-		// Set the full image as preview image. This will be overwritten, if the picture is larger than 640.
-		$image["preview"] = $image["full"];
-
-		// Deactivated, since that would result in a cropped preview, if the picture wasn't larger than 320
-		//if (isset($image["thumb"]))
-		//  $image["preview"] = $image["thumb"];
-
-		// Unsure, if this should be activated or deactivated
-		//if (isset($image["small"]))
-		//  $image["preview"] = $image["small"];
-
-		if (isset($image["medium"])) {
-			$image["preview"] = $image["medium"];
-		}
-
-		return($image);
+		return Images::getScalingDimensions($width, $height, $max);
 	}
 }