X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FImages.php;h=cf4964587e36f37c7afd98e4ca745dfd55e854b1;hp=6e4c4aea667c058f426a8f065fbfad1c52101c89;hb=0ab9a2636212f861c9853338b36297083bee3d53;hpb=d515a37572f62d8d353f6c7a370428af046b745e

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 6e4c4aea..cf496458 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -185,9 +185,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     {
         $opts = HTML_FlexyFramework::get()->Pman;
         $fn = preg_replace('/[^a-z0-9\.]+/i', '_', $this->filename);
-        print_r(implode( '/', array(
-            $opts['storedir'], '_images_', date('Y/m', strtotime($this->created)), $this->id . '-'. $fn
-        )));exit;
         return implode( '/', array(
             $opts['storedir'], '_images_', date('Y/m', strtotime($this->created)), $this->id . '-'. $fn
         ));
@@ -201,19 +198,41 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      */
     function beforeDelete()
     {
+        
+        $opts = HTML_FlexyFramework::get()->Pman;
+        $deldir = $opts['storedir']. '/_deleted_images_';
+        if (!file_exists( $deldir )) {
+            mkdir($dir, 0755);
+        }
+            
         $fn = $this->getStoreName();
+        $b = basename($fn);
         if (file_exists($fn)) {
-            unlink($fn);
+            
+            if (file_exists($deldir . '/'. $b)) {
+                unlink($fn);
+            } else {
+                rename($fn, $deldir .'/',$b);
+            }
+            
+            
         }
         // delete thumbs..
-        $b = basename($fn);
+        
         $d = dirname($fn);
         if (file_exists($d)) {
                 
             $dh = opendir($d);
             while (false !== ($fn = readdir($dh))) {
                 if (substr($fn, 0, strlen($b)) == $b) {
-                    unlink($d. '/'. $fn);
+                    
+                    if (file_exists($deldir . '/'. $fn)) {
+                        unlink($d. '/'. $fn);
+                        continue;
+                    }
+                    rename($d. '/'. $fn, $deldir .'/',$fn);
+                    
+                    
                 }
             }
         }