dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image

Browse Source
This commit is contained in:
Rémi Gaillard
2012-12-03 12:26:27 +01:00
parent 4a106e51bb
commit 428c1fa99b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Image.php
+4 -5
View File
@@ -409,9 +409,8 @@ class ImageCore extends ObjectModel
// Delete auto-generated images // Delete auto-generated images
$image_types = ImageType::getImagesTypes(); $image_types = ImageType::getImagesTypes();
foreach ($image_types as $image_type) foreach ($image_types as $image_type)
{
$files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-'.$image_type['name'].'.'.$this->image_format; $files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-'.$image_type['name'].'.'.$this->image_format;
}
// Delete watermark image // Delete watermark image
$files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-watermark.'.$this->image_format; $files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-watermark.'.$this->image_format;
// delete index.php // delete index.php
@@ -533,11 +532,11 @@ class ImageCore extends ObjectModel
if (!file_exists(_PS_PROD_IMG_DIR_.$this->getImgFolder())) if (!file_exists(_PS_PROD_IMG_DIR_.$this->getImgFolder()))
{ {
// Apparently sometimes mkdir cannot set the rights, and sometimes chmod can't. Trying both. // Apparently sometimes mkdir cannot set the rights, and sometimes chmod can't. Trying both.
$success = @mkdir(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights, true) $success = @mkdir(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights, true);
|| @chmod(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights); $chmod = @chmod(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights);
// Create an index.php file in the new folder // Create an index.php file in the new folder
if ($success if (($success || $chmod)
&& !file_exists(_PS_PROD_IMG_DIR_.$this->getImgFolder().'index.php') && !file_exists(_PS_PROD_IMG_DIR_.$this->getImgFolder().'index.php')
&& file_exists($this->source_index)) && file_exists($this->source_index))
return @copy($this->source_index, _PS_PROD_IMG_DIR_.$this->getImgFolder().'index.php'); return @copy($this->source_index, _PS_PROD_IMG_DIR_.$this->getImgFolder().'index.php');