AC-9883: Fix Catalog System Config

Author: sreenia806

app/code/Magento/Config/Model/Config/Backend/File.php

@@ -96,20 +96,12 @@ public function beforeSave()
         if (!empty($file)) {
             $uploadDir = $this->_getUploadDir();
             try {
-                // sanitize filename
-                $fileName = strtolower(
-                    preg_replace(
-                        ['#[\\s-]+#', '#[^A-Za-z0-9._ -]+#'],
-                        ['-', ''],
-                        $file['name']
-                    )
-                );
                 /** @var Uploader $uploader */
                 $uploader = $this->_uploaderFactory->create(['fileId' => $file]);
                 $uploader->setAllowedExtensions($this->_getAllowedExtensions());
                 $uploader->setAllowRenameFiles(true);
                 $uploader->addValidateCallback('size', $this, 'validateMaxSize');
-                $result = $uploader->save($uploadDir, $fileName);
+                $result = $uploader->save($uploadDir);
             } catch (Exception $e) {
                 throw new LocalizedException(__('%1', $e->getMessage()));
             }
@@ -287,7 +279,7 @@ protected function _getAllowedExtensions()
     private function setValueAfterValidation(string $value): void
     {
         // avoid intercepting value
-        if (!preg_match('/^[A-Za-z0-9._\/ -]*$/', $value)) {
+        if (preg_match('/[^a-z0-9_\\-\\.]+/i', $value)) {
             throw new LocalizedException(__('Invalid file name'));
         }
 

app/code/Magento/Config/Test/Unit/Model/Config/Backend/FileTest.php

@@ -152,7 +152,7 @@ public function testBeforeSave()
             ->willReturn($this->uploaderMock);
         $this->uploaderMock->expects($this->once())
             ->method('save')
-            ->with($uploadDir . '/' . $scope . '/' . $scopeId, $name)
+            ->with($uploadDir . '/' . $scope . '/' . $scopeId)
             ->willReturn($result);
 
         $this->assertEquals($this->model, $this->model->beforeSave());
@@ -197,7 +197,7 @@ public function testBeforeWithoutRequest()
             ->willReturn($this->uploaderMock);
         $this->uploaderMock->expects($this->once())
             ->method('save')
-            ->with($uploadDir, $name)
+            ->with($uploadDir)
             ->willReturn($result);
 
         $this->assertEquals($this->model, $this->model->beforeSave());
@@ -300,7 +300,7 @@ public function testBeforeSaveWithException()
             ->willReturn($this->uploaderMock);
         $this->uploaderMock->expects($this->once())
             ->method('save')
-            ->with($uploadDir, $name)
+            ->with($uploadDir)
             ->willThrowException(new \Exception($exception));
 
         $this->model->beforeSave();

app/code/Magento/Config/Test/Unit/Model/Config/Backend/Image/LogoTest.php

@@ -56,7 +56,7 @@ protected function setUp(): void
             ->willReturn($this->uploaderMock);
         $this->requestDataMock = $this
             ->getMockBuilder(RequestDataInterface::class)
-            ->setMethods(['getTmpName', 'getName'])
+            ->setMethods(['getTmpName'])
             ->getMockForAbstractClass();
         $mediaDirectoryMock = $this->getMockBuilder(WriteInterface::class)
             ->disableOriginalConstructor()
@@ -83,9 +83,6 @@ public function testBeforeSave()
         $this->requestDataMock->expects($this->once())
             ->method('getTmpName')
             ->willReturn('/tmp/val');
-        $this->requestDataMock->expects($this->once())
-            ->method('getName')
-            ->willReturn('filename');
         $this->uploaderMock->expects($this->once())
             ->method('setAllowedExtensions')
             ->with(['jpg', 'jpeg', 'gif', 'png']);

lib/internal/Magento/Framework/Data/Form/Element/Image.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
@@ -67,33 +66,35 @@ public function __construct(
      * Return element html code
      *
      * @return string
-     * @throws LocalizedException
      */
     public function getElementHtml()
     {
         $html = '';
 
-        if ((string)$this->getEscapedValue()) {
+        if ((string)$this->getValue()) {
             $url = $this->_getUrl();
 
             if (!preg_match("/^http\:\/\/|https\:\/\//", $url)) {
                 $url = $this->_urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]) . $url;
             }
 
             $linkId = 'linkId' .$this->random->getRandomString(8);
-            $html = '<a previewlinkid="' .$linkId  .'" href="' .
-                $url . '" ' .
+            $html = '<a previewlinkid="' .$linkId .'" href="' .
+                $url .
+                '" ' .
                 $this->_getUiId(
                     'link'
                 ) .
                 '>' .
-                '<img src="' . $url . '" id="' .
+                '<img src="' .
+                $url .
+                '" id="' .
                 $this->getHtmlId() .
                 '_image" title="' .
-                $this->getEscapedValue() .
+                $this->getValue() .
                 '"' .
                 ' alt="' .
-                $this->getEscapedValue() .
+                $this->getValue() .
                 '" height="22" width="22" class="small-image-preview v-middle"  ' .
                 $this->_getUiId() .
                 ' />' .
@@ -119,7 +120,7 @@ public function getElementHtml()
     protected function _getDeleteCheckbox()
     {
         $html = '';
-        if ($this->getEscapedValue()) {
+        if ($this->getValue()) {
             $label = (string)new \Magento\Framework\Phrase('Delete Image');
             $html .= '<span class="delete-image">';
             $html .= '<input type="checkbox"' .
@@ -152,8 +153,7 @@ protected function _getDeleteCheckbox()
      */
     protected function _getHiddenInput()
     {
-        return '<input type="hidden" name="' . parent::getName() .
-            '[value]" value="' . $this->getEscapedValue() . '" />';
+        return '<input type="hidden" name="' . parent::getName() . '[value]" value="' . $this->getValue() . '" />';
     }
 
     /**
@@ -163,7 +163,7 @@ protected function _getHiddenInput()
      */
     protected function _getUrl()
     {
-        return $this->getEscapedValue();
+        return $this->getValue();
     }
 
     /**