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.

1 files changed, 5 insertions, 7 deletions

diff --git a/core/helpers/MY_file.php b/core/helpers/dir.php
index c460a81a..02599467 100644
--- a/core/helpers/MY_file.php
+++ b/core/helpers/dir.php
@@ -17,19 +17,17 @@
  * 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)) {
+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()) {
-          self::unlink($resource->getPathName());
+          unlink($resource->getPathName());
         } else if ($resource->isDir()) {
-          self::unlink($resource->getRealPath());
+          directory::unlink($resource->getRealPath());
         }
         unset($resource);
       }