From 2d2b50d5dca7afa8523685a682a2dcc78b602ce2 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Fri, 27 Apr 2018 14:32:58 -0700 Subject: Remove all attachments when removing a project --- app/Core/ObjectStorage/FileStorage.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'app/Core/ObjectStorage') diff --git a/app/Core/ObjectStorage/FileStorage.php b/app/Core/ObjectStorage/FileStorage.php index 18453890..410951fb 100644 --- a/app/Core/ObjectStorage/FileStorage.php +++ b/app/Core/ObjectStorage/FileStorage.php @@ -128,12 +128,21 @@ class FileStorage implements ObjectStorageInterface public function remove($key) { $filename = $this->path.DIRECTORY_SEPARATOR.$key; + $result = false; if (file_exists($filename)) { - return unlink($filename); + $result = unlink($filename); + + // Remove parent folder if empty + $parentFolder = dirname($filename); + $files = glob($parentFolder.DIRECTORY_SEPARATOR.'*'); + + if ($files !== false && is_dir($parentFolder) && count($files) === 0) { + rmdir($parentFolder); + } } - return false; + return $result; } /** -- cgit v1.2.3