Prevent checking nonsupported image formats

Hlavtox · Jul 26, 2023 · 7834b34 · 7834b34
1 parent 21c1382
commit 7834b34
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
@@ -103,11 +103,17 @@ public function init()
         $formFields = [];
 
         if ($this->isMultipleImageFormatFeatureEnabled) {
+            /* We will disable few image formats
+             * Base JPG is mandatory, see https://github.com/PrestaShop/PrestaShop/issues/30944
+             * AVIF support depends on platform - PHP version and required libraries available
+             */
             $imageFormatsDisabled = [];
-            $imageFormatsDisabled['jpg'] = true; // jpg is mandatory, see https://github.com/PrestaShop/PrestaShop/issues/30944
-            if (false === $this->canGenerateAvif) {
+            $imageFormatsDisabled['jpg'] = true;
+            if (!$this->canGenerateAvif) {
                 $imageFormatsDisabled['avif'] = true;
             }
+
+            // Load configured formats to see what to check
             $configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
 
             $fields = [
@@ -476,6 +482,19 @@ public function initModal(): void
         ];
     }
 
+    public function beforeUpdateOptions()
+    {
+        // Unset AVIF if not supported, add JPG if missing
+        foreach ($_POST['PS_IMAGE_FORMAT'] as $k => $v) {
+            if ($v == 'avif' && !$this->canGenerateAvif) {
+                unset($_POST['PS_IMAGE_FORMAT'][$k]);
+            }
+        }
+        if (!in_array('jpg', $_POST['PS_IMAGE_FORMAT'])) {
+            $_POST['PS_IMAGE_FORMAT'][] = 'jpg';
+        }
+    }
+
     public function updateOptionPsImageFormat($value): void
     {
         if ($this->access('edit') != '1') {