Rewrote afterSave of product and category image attributes (#3301)

* Stop trying to upload image when there are no images
Allow to override extensions and models

* added return type for method

* added return type for method

---------

Co-authored-by: Fabrizio Balliano <[email protected]>

Author: luigifab

app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php

@@ -22,41 +22,51 @@
 class Mage_Catalog_Model_Category_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
 {
     /**
-     * Save uploaded file and set its name to category
+     * @return array
+     */
+    public function getAllowedExtensions(): array
+    {
+        return ['jpg', 'jpeg', 'gif', 'png'];
+    }
+
+    /**
+     * Save uploaded file and set its name to category attribute
      * @param Varien_Object $object
      * @return $this
      */
     public function afterSave($object)
     {
-        $value = $object->getData($this->getAttribute()->getName());
-        if (empty($value) && empty($_FILES)) {
-            return $this;
-        }
+        $name  = $this->getAttribute()->getName();
+        $value = $object->getData($name);
 
         if (is_array($value) && !empty($value['delete'])) {
-            $object->setData($this->getAttribute()->getName(), '');
-            $this->getAttribute()->getEntity()
-                ->saveAttribute($object, $this->getAttribute()->getName());
+            $object->setData($name, '');
+            $this->getAttribute()->getEntity()->saveAttribute($object, $name);
             return $this;
         }
 
-        $path = Mage::getBaseDir('media') . DS . 'catalog' . DS . 'category' . DS;
+        if (!empty($_FILES[$name])) {
+            try {
+                $validator = Mage::getModel('core/file_validator_image');
+                $uploader  = Mage::getModel('core/file_uploader', $name);
+                $uploader->setAllowedExtensions($this->getAllowedExtensions());
+                $uploader->setAllowRenameFiles(true);
+                $uploader->setFilesDispersion(false);
+                $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
+                $uploader->save(Mage::getBaseDir('media') . DS . 'catalog' . DS . 'category');
 
-        try {
-            $validator = Mage::getModel('core/file_validator_image');
-            $uploader = new Mage_Core_Model_File_Uploader($this->getAttribute()->getName());
-            $uploader->setAllowedExtensions(['jpg','jpeg','gif','png']);
-            $uploader->setAllowRenameFiles(true);
-            $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
-            $result = $uploader->save($path);
-
-            $object->setData($this->getAttribute()->getName(), $result['file']);
-            $this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName());
-        } catch (Exception $e) {
-            if ($e->getCode() != UPLOAD_ERR_NO_FILE) {
-                Mage::logException($e);
+                $fileName = $uploader->getUploadedFileName();
+                if ($fileName) {
+                    $object->setData($name, $fileName);
+                    $this->getAttribute()->getEntity()->saveAttribute($object, $name);
+                }
+            } catch (Exception $e) {
+                if ($e->getCode() != UPLOAD_ERR_NO_FILE) {
+                    Mage::logException($e);
+                }
             }
         }
+
         return $this;
     }
 }

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php

@@ -22,37 +22,49 @@
 class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
 {
     /**
+     * @return array
+     */
+    public function getAllowedExtensions(): array
+    {
+        return ['jpg', 'jpeg', 'gif', 'png'];
+    }
+
+    /**
+     * Save uploaded file and set its name to product attribute
      * @param Varien_Object $object
      * @return $this
      */
     public function afterSave($object)
     {
-        $value = $object->getData($this->getAttribute()->getName());
+        $name  = $this->getAttribute()->getName();
+        $value = $object->getData($name);
 
         if (is_array($value) && !empty($value['delete'])) {
-            $object->setData($this->getAttribute()->getName(), '');
-            $this->getAttribute()->getEntity()
-                ->saveAttribute($object, $this->getAttribute()->getName());
+            $object->setData($name, '');
+            $this->getAttribute()->getEntity()->saveAttribute($object, $name);
             return $this;
         }
 
-        try {
-            $validator = Mage::getModel('core/file_validator_image');
-            $uploader = new Mage_Core_Model_File_Uploader($this->getAttribute()->getName());
-            $uploader->setAllowedExtensions(['jpg', 'jpeg', 'gif', 'png']);
-            $uploader->setAllowRenameFiles(true);
-            $uploader->setFilesDispersion(true);
-            $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
-            $uploader->save(Mage::getBaseDir('media') . '/catalog/product');
+        if (!empty($_FILES[$name])) {
+            try {
+                $validator = Mage::getModel('core/file_validator_image');
+                $uploader  = Mage::getModel('core/file_uploader', $name);
+                $uploader->setAllowedExtensions($this->getAllowedExtensions());
+                $uploader->setAllowRenameFiles(true);
+                $uploader->setFilesDispersion(true);
+                $uploader->addValidateCallback(Mage_Core_Model_File_Validator_Image::NAME, $validator, 'validate');
+                $uploader->save(Mage::getBaseDir('media') . DS . 'catalog' . DS . 'product');
 
-            $fileName = $uploader->getUploadedFileName();
-            if ($fileName) {
-                $object->setData($this->getAttribute()->getName(), $fileName);
-                $this->getAttribute()->getEntity()
-                    ->saveAttribute($object, $this->getAttribute()->getName());
+                $fileName = $uploader->getUploadedFileName();
+                if ($fileName) {
+                    $object->setData($name, $fileName);
+                    $this->getAttribute()->getEntity()->saveAttribute($object, $name);
+                }
+            } catch (Exception $e) {
+                if ($e->getCode() != UPLOAD_ERR_NO_FILE) {
+                    Mage::logException($e);
+                }
             }
-        } catch (Exception $e) {
-            return $this;
         }
 
         return $this;