From 7bb4b6029df8b17ef8a2ba9c8ce8d6c7b3e015c3 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 3 Dec 2008 22:39:57 +0000 Subject: Add a MY_file class that extends the file helper by creating an unlink method that deletes a file or an album directory. Modify Items_Controller::_delete to call this new helper method when deleting an item --- core/controllers/items.php | 2 ++ core/helpers/MY_file.php | 43 +++++++++++++++++++++++++++++++++++++++++ core/tests/File_Helper_Test.php | 40 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 core/helpers/MY_file.php create mode 100644 core/tests/File_Helper_Test.php (limited to 'core') diff --git a/core/controllers/items.php b/core/controllers/items.php index 6cf27fbf..6ba7db65 100644 --- a/core/controllers/items.php +++ b/core/controllers/items.php @@ -100,7 +100,9 @@ class Items_Controller extends REST_Controller { $parent = $item->parent(); if ($parent->id) { module::event("{$item->type}_before_delete", $item); + $item->delete(); + file::unlink($item->file_path()); } url::redirect("{$parent->type}s/{$parent->id}"); diff --git a/core/helpers/MY_file.php b/core/helpers/MY_file.php new file mode 100644 index 00000000..89e81204 --- /dev/null +++ b/core/helpers/MY_file.php @@ -0,0 +1,43 @@ +isDot()) { + unset($resource); + continue; + } else if ($resource->isFile()) { + self::unlink($resource->getPathName()); + } else if ($resource->isDir()) { + self::unlink($resource->getRealPath()); + } + unset($resource); + } + return @rmdir($path); + } + return false; + } + + +} diff --git a/core/tests/File_Helper_Test.php b/core/tests/File_Helper_Test.php new file mode 100644 index 00000000..dd71aabb --- /dev/null +++ b/core/tests/File_Helper_Test.php @@ -0,0 +1,40 @@ +assert_boolean(!file_exists($filename), "File not deleted"); + } + + public function remove_album_test() { + $dirname = (VARPATH . "albums/testdir"); + mkdir($dirname, 0777, true); + + $filename = tempnam($dirname, "file"); + touch($filename); + + file::unlink($dirname); + $this->assert_boolean(!file_exists($filename), "File not deleted"); + $this->assert_boolean(!file_exists($dirname), "Directory not deleted"); + } +} -- cgit v1.2.3