X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=d9d53008f0c31bbd2bf50e11ade1ee733b012099;hb=6376efd4af86923fec4987504b9a08c460d0a0d0;hp=3b92661218225c3c0748a4375abf7c76aec713b6;hpb=008c679de4012e88b75ad8427c10373cb3f3ee23;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 3b926612..d9d53008 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -29,6 +29,19 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+    function applyFilters($q, $au, $roo)
+    {
+        $tn = $this->tableName();
+        
+        if(!empty($q['search']['filename'])){
+            echo "$tn.filename LIKE '%{$this->escape($q['search']['filename'])}%'"; die;
+            $this->whereAdd("
+                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%'
+            ");
+        }
+        
+
+    }
     
     function checkPerm($lvl, $au)
     {
@@ -118,9 +131,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $this->mimetype = $y->fromFilename($filename);
         }
         
-        $this->mimetype= strtolower($this->mimetype);
+        $this->mimetype = strtolower($this->mimetype);
         
-        if (array_shift(explode('/', $this->mimetype)) == 'image') { 
+        $mta = explode('/', $this->mimetype);
+        if (array_shift($mta) == 'image') { 
         
             $imgs = @getimagesize($file);
             
@@ -196,21 +210,42 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      * 
      * 
      */
-    function beforeDelete()
+    function beforeDelete($dependants_array, $roo)
     {
+        
+        $opts = HTML_FlexyFramework::get()->Pman;
+        $deldir = $opts['storedir']. '/_deleted_images_';
+        if (!file_exists( $deldir )) {
+            mkdir($deldir, 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);
+                    
                 }
             }
         }
@@ -806,7 +841,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
 
         $pdfinfo = System::which('pdfinfo');
 
-        if (empty($pdfinfo)) {
+        if (!file_exists($file) || empty($pdfinfo)) {
             return $page;
         }