Merge pull request #10257 from annando/apcontact-no-normalize

[friendica.git] / src / Util / Images.php

diff --git a/src/Util/Images.php b/src/Util/Images.php
index f0aefb9f2c298822a315555e2d4b76a6d8fddbba..a65f9a1a8b16fa24ed022a74ea1711d4aee0730a 100644 (file)
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -75,25 +75,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'];
                }
 
@@ -186,7 +184,7 @@ class Images
                        return $data;
                }
 
-               $img_str = DI::httpRequest()->fetch($url, true, 4);
+               $img_str = DI::httpRequest()->fetch($url, 4);
 
                if (!$img_str) {
                        return [];