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

[-] Classes : fixed image folders rights

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9393 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-10-17 14:57:58 +00:00
parent bf309b0d51
commit 643346b806
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Image.php
+30 -20
View File
@@ -57,7 +57,7 @@ class ImageCore extends ObjectModel
protected $existing_path; protected $existing_path;
/** @var int access rights of created folders (octal) */ /** @var int access rights of created folders (octal) */
protected $access_rights = 0775; protected static $access_rights = 0775;
protected $tables = array ('image', 'image_lang'); protected $tables = array ('image', 'image_lang');
@@ -445,20 +445,23 @@ class ImageCore extends ObjectModel
} }
// Can we remove the image folder? // Can we remove the image folder?
$remove_folder = true; if (is_numeric(basename($path)))
foreach (scandir($path) as $file)
if (($file != '.' && $file != '..'&& $file != 'index.php'))
{
$remove_folder = false;
break;
}
if ($remove_folder)
{ {
// we're only removing index.php if it's a folder we want to delete $remove_folder = true;
if (file_exists($path.'index.php')) foreach (scandir($path) as $file)
@unlink ($path.'index.php'); if (($file != '.' && $file != '..'&& $file != 'index.php'))
@rmdir($path); {
$remove_folder = false;
break;
}
if ($remove_folder)
{
// we're only removing index.php if it's a folder we want to delete
if (file_exists($path.'index.php'))
@unlink ($path.'index.php');
@rmdir($path);
}
} }
return true; return true;
@@ -514,8 +517,8 @@ 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(), $access_rights, true) $success = @mkdir(_PS_PROD_IMG_DIR_.$this->getImgFolder(), self::$access_rights, true)
|| @chmod(_PS_PROD_IMG_DIR_.$this->getImgFolder(), $access_rights); || @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
@@ -589,8 +592,8 @@ class ImageCore extends ObjectModel
{ {
if (!file_exists(_PS_PROD_IMG_DIR_.$tmp_folder)) if (!file_exists(_PS_PROD_IMG_DIR_.$tmp_folder))
{ {
@mkdir(_PS_PROD_IMG_DIR_.$tmp_folder, $access_rights); @mkdir(_PS_PROD_IMG_DIR_.$tmp_folder, self::$access_rights);
@chmod(_PS_PROD_IMG_DIR_.$tmp_folder, $access_rights); @chmod(_PS_PROD_IMG_DIR_.$tmp_folder, self::$access_rights);
} }
$tmp_path = _PS_PROD_IMG_DIR_.$tmp_folder.basename($file); $tmp_path = _PS_PROD_IMG_DIR_.$tmp_folder.basename($file);
if (!@rename($new_path, $tmp_path) || !file_exists($tmp_path)) if (!@rename($new_path, $tmp_path) || !file_exists($tmp_path))
@@ -607,6 +610,11 @@ class ImageCore extends ObjectModel
return true; return true;
} }
/**
* Try to create and delete some folders to check if moving images to new file system will be possible
*
* @return boolean success
*/
public static function testFileSystem() public static function testFileSystem()
{ {
$safe_mode = ini_get('safe_mode'); $safe_mode = ini_get('safe_mode');
@@ -614,6 +622,7 @@ class ImageCore extends ObjectModel
return false; return false;
$folder1 = _PS_PROD_IMG_DIR_.'testfilesystem/'; $folder1 = _PS_PROD_IMG_DIR_.'testfilesystem/';
$test_folder = $folder1.'testsubfolder/'; $test_folder = $folder1.'testsubfolder/';
// check if folders are already existing from previous failed test
if (file_exists($test_folder)) if (file_exists($test_folder))
{ {
@rmdir($test_folder); @rmdir($test_folder);
@@ -621,8 +630,9 @@ class ImageCore extends ObjectModel
} }
if (file_exists($test_folder)) if (file_exists($test_folder))
return false; return false;
@mkdir($test_folder, $access_rights, true);
@chmod($test_folder, $access_rights); @mkdir($test_folder, self::$access_rights, true);
@chmod($test_folder, self::$access_rights);
if (!is_writeable($test_folder)) if (!is_writeable($test_folder))
return false; return false;
@rmdir($test_folder); @rmdir($test_folder);