X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FImage.php;h=45c8bedeaf58397abe15b1b7684a009156f63cad;hb=2b537840941634d561ba3eed2215aedca7897471;hp=2f4d55dc0ac15c3a03d407f36c59bc67abbd1a1b;hpb=eed35c3e6954a1cc0cd29e20ae191e411cb4fce5;p=friendica.git

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 2f4d55dc0a..45c8bedeaf 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -5,15 +5,16 @@
  */
 namespace Friendica\Object;
 
+use Exception;
 use Friendica\App;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Util\Network;
-use Exception;
 use Imagick;
 use ImagickPixel;
 
@@ -22,6 +23,7 @@ use ImagickPixel;
  */
 class Image
 {
+	/** @var Imagick|resource */
 	private $image;
 
 	/*
@@ -61,9 +63,10 @@ class Image
 
 	/**
 	 * @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)
 	{
@@ -124,8 +127,10 @@ class Image
 	}
 
 	/**
-	 * @param object $data data
+	 * @param string $data data
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private function loadData($data)
 	{
@@ -294,8 +299,6 @@ class Image
 		$width = $this->getWidth();
 		$height = $this->getHeight();
 
-		$dest_width = $dest_height = 0;
-
 		if ((! $width)|| (! $height)) {
 			return false;
 		}
@@ -481,7 +484,7 @@ class Image
 				break;
 		}
 
-		//	logger('exif: ' . print_r($exif,true));
+		//	Logger::log('exif: ' . print_r($exif,true));
 		return $exif;
 	}
 
@@ -498,8 +501,6 @@ class Image
 		$width = $this->getWidth();
 		$height = $this->getHeight();
 
-		$dest_width = $dest_height = 0;
-
 		if ((!$width)|| (!$height)) {
 			return false;
 		}
@@ -641,6 +642,7 @@ class Image
 	/**
 	 * @param string $path file path
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function saveToFilePath($path)
 	{
@@ -650,11 +652,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 +667,7 @@ class Image
 	 * $data = (string) $Image;
 	 *
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function __toString() {
 		return $this->asString();
@@ -672,6 +675,7 @@ class Image
 
 	/**
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function asString()
 	{
@@ -686,8 +690,6 @@ class Image
 			return $string;
 		}
 
-		$quality = false;
-
 		ob_start();
 
 		// Enable interlacing
@@ -719,20 +721,24 @@ class Image
 	 *
 	 * @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
+	 * @throws \ImagickException
 	 */
-	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);
+		Logger::log('Image: guessType: '.$filename . ($fromcurl?' from curl headers':''), Logger::DEBUG);
 		$type = null;
 		if ($fromcurl) {
-			$a = get_app();
 			$headers=[];
-			$h = explode("\n", $a->get_curl_headers());
+			$h = explode("\n", $header);
 			foreach ($h as $l) {
-				list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-				$headers[$k] = $v;
+				$data = array_map("trim", explode(":", trim($l), 2));
+				if (count($data) > 1) {
+					list($k,$v) = $data;
+					$headers[$k] = $v;
+				}
 			}
 			if (array_key_exists('Content-Type', $headers))
 				$type = $headers['Content-Type'];
@@ -759,36 +765,50 @@ class Image
 				}
 			}
 		}
-		logger('Image: guessType: type='.$type, LOGGER_DEBUG);
+		Logger::log('Image: guessType: type='.$type, Logger::DEBUG);
 		return $type;
 	}
 
 	/**
 	 * @param string $url url
 	 * @return object
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getInfoFromURL($url)
 	{
 		$data = [];
 
+		if (empty($url)) {
+			return $data;
+		}
+
 		$data = Cache::get($url);
 
 		if (is_null($data) || !$data || !is_array($data)) {
 			$img_str = Network::fetchUrl($url, true, $redirects, 4);
+
+			if (!$img_str) {
+				return false;
+			}
+
 			$filesize = strlen($img_str);
 
-			if (function_exists("getimagesizefromstring")) {
-				$data = getimagesizefromstring($img_str);
-			} else {
-				$tempfile = tempnam(get_temppath(), "cache");
+			try {
+				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");
+					$a = \get_app();
+					$stamp1 = microtime(true);
+					file_put_contents($tempfile, $img_str);
+					$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 
-				$data = getimagesize($tempfile);
-				unlink($tempfile);
+					$data = getimagesize($tempfile);
+					unlink($tempfile);
+				}
+			} catch (Exception $e) {
+				return false;
 			}
 
 			if ($data) {
@@ -809,8 +829,6 @@ class Image
 	 */
 	public static function getScalingDimensions($width, $height, $max)
 	{
-		$dest_width = $dest_height = 0;
-
 		if ((!$width) || (!$height)) {
 			return false;
 		}
@@ -857,11 +875,13 @@ class Image
 
 	/**
 	 * @brief This function is used by the fromgplus addon
-	 * @param object  $a         App
+	 * @param App     $a         App
 	 * @param integer $uid       user id
 	 * @param string  $imagedata optional, default empty
 	 * @param string  $url       optional, default empty
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function storePhoto(App $a, $uid, $imagedata = "", $url = "")
 	{
@@ -871,8 +891,8 @@ class Image
 			intval($uid)
 		);
 
-		if (!DBM::is_result($r)) {
-			logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
+		if (!DBA::isResult($r)) {
+			Logger::log("Can't detect user data for uid ".$uid, Logger::DEBUG);
 			return([]);
 		}
 
@@ -880,23 +900,23 @@ class Image
 
 		/// @TODO
 		/// $default_cid      = $r[0]['id'];
-		/// $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+		/// $community_page   = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
 
 		if ((strlen($imagedata) == 0) && ($url == "")) {
-			logger("No image data and no url provided", LOGGER_DEBUG);
+			Logger::log("No image data and no url provided", Logger::DEBUG);
 			return([]);
 		} elseif (strlen($imagedata) == 0) {
-			logger("Uploading picture from ".$url, LOGGER_DEBUG);
+			Logger::log("Uploading picture from ".$url, Logger::DEBUG);
 
 			$stamp1 = microtime(true);
 			$imagedata = @file_get_contents($url);
-			$a->save_timestamp($stamp1, "file");
+			$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 		}
 
 		$maximagesize = Config::get('system', 'maximagesize');
 
 		if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
-			logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
+			Logger::log("Image exceeds size limit of ".$maximagesize, Logger::DEBUG);
 			return([]);
 		}
 
@@ -904,13 +924,13 @@ class Image
 
 		$stamp1 = microtime(true);
 		file_put_contents($tempfile, $imagedata);
-		$a->save_timestamp($stamp1, "file");
+		$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 
 		$data = getimagesize($tempfile);
 
 		if (!isset($data["mime"])) {
 			unlink($tempfile);
-			logger("File is no picture", LOGGER_DEBUG);
+			Logger::log("File is no picture", Logger::DEBUG);
 			return([]);
 		}
 
@@ -918,7 +938,7 @@ class Image
 
 		if (!$Image->isValid()) {
 			unlink($tempfile);
-			logger("Picture is no valid picture", LOGGER_DEBUG);
+			Logger::log("Picture is no valid picture", Logger::DEBUG);
 			return([]);
 		}
 
@@ -939,8 +959,6 @@ class Image
 
 		$hash = Photo::newResource();
 
-		$smallest = 0;
-
 		// Pictures are always public by now
 		//$defperm = '<'.$default_cid.'>';
 		$defperm = "";
@@ -949,7 +967,7 @@ class Image
 		$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 0, 0, $defperm);
 
 		if (!$r) {
-			logger("Picture couldn't be stored", LOGGER_DEBUG);
+			Logger::log("Picture couldn't be stored", Logger::DEBUG);
 			return([]);
 		}