Merge pull request #55 from Progi1984/fixGetMimeType

Fix get mime type
PrestaShop · Nov 5, 2020 · f53b9e6 · f53b9e6
2 parents 5a3d340 + 1ac495a
commit f53b9e6
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 42 deletions.
diff --git a/blockreassurance.php b/blockreassurance.php
@@ -133,7 +133,7 @@ public function __construct()
         // Confirm uninstall
         $this->confirmUninstall = $this->trans('Are you sure you want to uninstall this module?', [], 'Modules.Blockreassurance.Admin');
         $this->ps_url = $this->context->link->getBaseLink();
-        $this->ps_versions_compliancy = ['min' => '1.7.7.0', 'max' => _PS_VERSION_];
+        $this->ps_versions_compliancy = ['min' => '1.7', 'max' => _PS_VERSION_];
         $this->templateFile = 'module:blockreassurance/views/templates/hook/blockreassurance.tpl';
     }
 

diff --git a/classes/ReassuranceActivity.php b/classes/ReassuranceActivity.php
@@ -178,7 +178,7 @@ public static function getAllBlockByStatus($id_lang = 1, $id_shop = 1)
     {
         $sql = 'SELECT * FROM `' . _DB_PREFIX_ . 'psreassurance` pr
             LEFT JOIN ' . _DB_PREFIX_ . 'psreassurance_lang prl ON (pr.id_psreassurance = prl.id_psreassurance)
-            WHERE prl.id_lang = "' . (int) $id_lang . '" 
+            WHERE prl.id_lang = "' . (int) $id_lang . '"
                 AND prl.id_shop = "' . (int) $id_shop . '"
                 AND pr.status = 1
             ORDER BY pr.position';
@@ -187,9 +187,47 @@ public static function getAllBlockByStatus($id_lang = 1, $id_shop = 1)
 
         foreach ($result as &$item) {
             $item['is_svg'] = !empty($item['custom_icon'])
-                && (ImageManager::getMimeType(str_replace(__PS_BASE_URI__, _PS_ROOT_DIR_ . DIRECTORY_SEPARATOR, $item['custom_icon'])) == 'image/svg');
+                && (self::getMimeType(str_replace(__PS_BASE_URI__, _PS_ROOT_DIR_ . DIRECTORY_SEPARATOR, $item['custom_icon'])) == 'image/svg');
         }
 
         return $result;
     }
+
+    /**
+     * @return string|bool
+     */
+    public static function getMimeType(string $filename)
+    {
+        $mimeType = false;
+        // Try with GD
+        if (function_exists('getimagesize')) {
+            $imageInfo = @getimagesize($filename);
+            if ($imageInfo) {
+                $mimeType = $imageInfo['mime'];
+            }
+        }
+        // Try with FileInfo
+        if (!$mimeType && function_exists('finfo_open')) {
+            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
+            $finfo = finfo_open($const);
+            $mimeType = finfo_file($finfo, $filename);
+            finfo_close($finfo);
+        }
+        // Try with Mime
+        if (!$mimeType && function_exists('mime_content_type')) {
+            $mimeType = mime_content_type($filename);
+        }
+        // Try with exec command and file binary
+        if (!$mimeType && function_exists('exec')) {
+            $mimeType = trim(exec('file -b --mime-type ' . escapeshellarg($filename)));
+            if (!$mimeType) {
+                $mimeType = trim(exec('file --mime ' . escapeshellarg($filename)));
+            }
+            if (!$mimeType) {
+                $mimeType = trim(exec('file -bi ' . escapeshellarg($filename)));
+            }
+        }
+
+        return $mimeType;
+    }
 }
diff --git a/controllers/admin/AdminBlockListingController.php b/controllers/admin/AdminBlockListingController.php
@@ -186,7 +186,7 @@ public function displayAjaxSaveBlockContent()
             } else {
                 // PrestaShop < 1.7.7
                 $validUpload = false;
-                $mimeType = $this->getMimeType($customImage['tmp_name']);
+                $mimeType = ReassuranceActivity::getMimeType($customImage['tmp_name']);
                 if ($mimeType && (
                     !in_array($mimeType, $authMimeType)
                     || !ImageManager::isCorrectImageFileExt($customImage['name'], $authExtensions)
@@ -248,42 +248,4 @@ public function displayAjaxUpdatePosition()
         // Response
         $this->ajaxRenderJson($result ? 'success' : 'error');
     }
-
-    /**
-     * @return string|bool
-     */
-    private function getMimeType(string $filename)
-    {
-        $mimeType = false;
-        // Try with GD
-        if (function_exists('getimagesize')) {
-            $imageInfo = @getimagesize($filename);
-            if ($imageInfo) {
-                $mimeType = $imageInfo['mime'];
-            }
-        }
-        // Try with FileInfo
-        if (!$mimeType && function_exists('finfo_open')) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
-            $finfo = finfo_open($const);
-            $mimeType = finfo_file($finfo, $filename);
-            finfo_close($finfo);
-        }
-        // Try with Mime
-        if (!$mimeType && function_exists('mime_content_type')) {
-            $mimeType = mime_content_type($filename);
-        }
-        // Try with exec command and file binary
-        if (!$mimeType && function_exists('exec')) {
-            $mimeType = trim(exec('file -b --mime-type ' . escapeshellarg($filename)));
-            if (!$mimeType) {
-                $mimeType = trim(exec('file --mime ' . escapeshellarg($filename)));
-            }
-            if (!$mimeType) {
-                $mimeType = trim(exec('file -bi ' . escapeshellarg($filename)));
-            }
-        }
-
-        return $mimeType;
-    }
 }