From ccee9854c29f9fedfeb5647d058e76154f9a8295 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 3 Dec 2008 23:31:10 +0000 Subject: Rename file::unlink() to dir::unlink(). This creates an API that is clearer about its actions, otherwise we may accidentally blow away an entire hierarchy when we think we're deleting a single file (there's a reason why rm won't let you delete dirs that aren't empty!) Name it "dir" instead of "directory" because apparently "directory" is already reserved. Move the delete call out of Items_Controller and into the model. The model is responsible for keeping state integrity, not the controller. --- core/models/item.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'core/models') diff --git a/core/models/item.php b/core/models/item.php index 9d23170f..211459b9 100644 --- a/core/models/item.php +++ b/core/models/item.php @@ -39,6 +39,15 @@ class Item_Model extends ORM_MPTT { return $this->type == 'photo'; } + public function delete() { + parent::delete(); + if ($this->is_album()) { + directory::unlink($this->file_path()); + } else { + unlink($this->file_path()); + } + } + /** * album: /var/albums/album1/album2 * photo: /var/albums/album1/album2/photo.jpg -- cgit v1.2.3