stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 03:19:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a MY_file class that extends the file helper by creating an unlink method that deletes a file or an album directory.

Browse Source 
Modify Items_Controller::_delete to call this new helper method when deleting an item
This commit is contained in:
Tim Almdal
2008-12-03 22:39:57 +00:00
parent d8511f2fde
commit 7bb4b6029d
3 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/controllers/items.php
View File

@@ -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}");

43
core/helpers/MY_file.php Normal file
View File

@@ -0,0 +1,43 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2008 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class file extends file_Core {
public function unlink($path) {
// @todo create a unit test
if (is_file($path) && is_writable($path)) {
return @unlink($path);
} else if (is_dir($path) && is_writable($path)) {
foreach (new DirectoryIterator($path) as $resource) {
if ($resource->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;
}
}

40
core/tests/File_Helper_Test.php Normal file
View File

@@ -0,0 +1,40 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2008 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class File_Helper_Test extends Unit_Test_Case {
public function remove_file_test() {
$filename = tempnam(VARPATH . "albums", "file");
touch($filename);
file::unlink($filename);
$this->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");
}
}