From ccee9854c29f9fedfeb5647d058e76154f9a8295 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
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/helpers/MY_file.php | 42 ------------------------------------------
 core/helpers/dir.php     | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 42 deletions(-)
 delete mode 100644 core/helpers/MY_file.php
 create mode 100644 core/helpers/dir.php

(limited to 'core/helpers')

diff --git a/core/helpers/MY_file.php b/core/helpers/MY_file.php
deleted file mode 100644
index c460a81a..00000000
--- a/core/helpers/MY_file.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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) {
-    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;
-  }
-
-
-}
diff --git a/core/helpers/dir.php b/core/helpers/dir.php
new file mode 100644
index 00000000..02599467
--- /dev/null
+++ b/core/helpers/dir.php
@@ -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 dir_Core {
+  public static function unlink($path) {
+    if (is_dir($path) && is_writable($path)) {
+      foreach (new DirectoryIterator($path) as $resource) {
+        if ($resource->isDot()) {
+          unset($resource);
+          continue;
+        } else if ($resource->isFile()) {
+          unlink($resource->getPathName());
+        } else if ($resource->isDir()) {
+          directory::unlink($resource->getRealPath());
+        }
+        unset($resource);
+      }
+      return @rmdir($path);
+    }
+    return false;
+  }
+
+
+}
-- 
cgit v1.2.3