X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FImages.php;h=d7a58b52aa7faeaf3a275488412c4139405a80e8;hb=8039ab731fe0045088a9834cdc1fa6a44b9719aa;hp=c1ac731b6cf9b6af18c8af606c62029ad45cbd50;hpb=803c1d71de9e6d13da9576660c9ab8b8bb2c19f3;p=friendica.git

diff --git a/src/Util/Images.php b/src/Util/Images.php
index c1ac731b6c..d7a58b52aa 100644
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -46,6 +46,30 @@ class Images
 		return $m;
 	}
 
+	/**
+	 * Return file extension for mime type
+	 * @param string $mimetype
+	 * @return string
+	 */
+	public static function getExtensionByMimeType(string $mimetype): string
+	{
+		switch ($mimetype) {
+			case 'image/png':
+				$imagetype = IMAGETYPE_PNG;
+				break;
+
+			case 'image/gif':
+				$imagetype = IMAGETYPE_GIF;
+				break;
+
+			default:
+				$imagetype = IMAGETYPE_JPEG;
+				break;
+		}
+
+		return image_type_to_extension($imagetype);
+	}
+
 	/**
 	 * Returns supported image mimetypes and corresponding file extensions
 	 *
@@ -75,25 +99,23 @@ class Images
 	/**
 	 * Fetch image mimetype from the image data or guessing from the file name
 	 *
-	 * @param string   $image_data Image data
-	 * @param string   $filename   File name (for guessing the type via the extension)
-	 * @param string[] $mimeTypes  possible mime types
+	 * @param string $image_data Image data
+	 * @param string $filename   File name (for guessing the type via the extension)
+	 * @param string $mime       default mime type
 	 *
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function getMimeTypeByData(string $image_data, string $filename = '', array $mimeTypes = [])
+	public static function getMimeTypeByData(string $image_data, string $filename = '', string $mime = '')
 	{
-		foreach ($mimeTypes as $mimeType) {
-			if (substr($mimeType, 0, 6) == 'image/') {
-				Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mimeTypes]);
-				return $mimeType;
-			}
+		if (substr($mime, 0, 6) == 'image/') {
+			Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mime]);
+			return $mime;
 		}
 
 		$image = @getimagesizefromstring($image_data);
 		if (!empty($image['mime'])) {
-			Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mimeTypes, 'mime' => $image['mime']]);
+			Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mime, 'mime' => $image['mime']]);
 			return $image['mime'];
 		}
 
@@ -162,12 +184,14 @@ class Images
 			return $data;
 		}
 
-		$data = DI::cache()->get($url);
+		$cacheKey = 'getInfoFromURL:' . sha1($url);
+
+		$data = DI::cache()->get($cacheKey);
 
 		if (empty($data) || !is_array($data)) {
 			$data = self::getInfoFromURL($url);
 
-			DI::cache()->set($url, $data);
+			DI::cache()->set($cacheKey, $data);
 		}
 
 		return $data;
@@ -195,7 +219,7 @@ class Images
 		}
 
 		if (empty($img_str)) {
-			$img_str = DI::httpRequest()->fetch($url, 4);
+			$img_str = DI::httpClient()->fetch($url, 4);
 		}
 
 		if (!$img_str) {