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

1 files changed, 43 insertions, 0 deletions

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 @@
+<?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;
+  }
+
+
+}