X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FImages.php;h=077509d3cb5e6e1c64105e2a7886bd131cf31be5;hb=71cf72cc8bde161471b2294c675fb0500dd48399;hp=1dcca2e3929a13e140df56c8829fc4d6d88758a5;hpb=26401e88b87646cabc21eb7a095b3ac8ebd76fe9;p=friendica.git

diff --git a/src/Util/Images.php b/src/Util/Images.php
index 1dcca2e392..077509d3cb 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
 	 *
@@ -77,21 +101,21 @@ class Images
 	 *
 	 * @param string $image_data Image data
 	 * @param string $filename   File name (for guessing the type via the extension)
-	 * @param string $mimeType   possible mime type
+	 * @param string $mime       default mime type
 	 *
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function getMimeTypeByData(string $image_data, string $filename = '', string $mimeType = '')
+	public static function getMimeTypeByData(string $image_data, string $filename = '', string $mime = '')
 	{
-		if (substr($mimeType, 0, 6) == 'image/') {
-			Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mimeType]);
-			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' => $mimeType, 'mime' => $image['mime']]);
+			Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mime, 'mime' => $image['mime']]);
 			return $image['mime'];
 		}
 
@@ -193,7 +217,7 @@ class Images
 		}
 
 		if (empty($img_str)) {
-			$img_str = DI::httpRequest()->fetch($url, 4);
+			$img_str = DI::httpClient()->fetch($url, 4);
 		}
 
 		if (!$img_str) {