viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-07-01 08:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

FileManager: bug fixes

Browse Source
This commit is contained in:
Taras Machyshyn
2016-11-18 17:33:29 +02:00
parent 55c632979e
commit ea99ca3d38
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/Espo/Core/Utils/File/Manager.php
View File

@@ -625,12 +625,19 @@ class Manager
$items = (array) $items;
}
$removeList = array();
$permissionDeniedList = array();
foreach ($items as $item) {
if (isset($dirPath)) {
$item = Utils\Util::concatPath($dirPath, $item);
}
if (!file_exists($item)) {
continue;
}
$removeList[] = $item;
if (!is_writable($item)) {
$permissionDeniedList[] = $item;
} else if (!is_writable(dirname($item))) {
@@ -644,11 +651,7 @@ class Manager
}
$result = true;
foreach ($items as $item) {
if (isset($dirPath)) {
$item = Utils\Util::concatPath($dirPath, $item);
}
foreach ($removeList as $item) {
if (is_dir($item)) {
$result &= $this->removeInDir($item, true);
} else {