X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=92de2468d69a484dc24d219dab5d13dd05b12d40;hb=9ad504766f4829168ee156833cca1f6ea363a44f;hp=d847abffe17e43fe401a5949e5ca7f14076e58a6;hpb=418294234893f8f8fda66557870ad2ceefe526cb;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index d847abff..92de2468 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -29,6 +29,21 @@ 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'])){
+            $this->whereAdd("
+                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%'
+            ");
+                echo $this->whereAdd("
+                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%'
+            "); die;
+        }
+        
+
+    }
     
     function checkPerm($lvl, $au)
     {
@@ -118,9 +133,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,23 +212,24 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      * 
      * 
      */
-    function beforeDelete()
+    function beforeDelete($dependants_array, $roo)
     {
         
         $opts = HTML_FlexyFramework::get()->Pman;
-        $dir = $opts['storedir']. '/_deleted_images_';
-        if (!file_exists( $dir)) {
-            mkdir($dir, 0755);
+        $deldir = $opts['storedir']. '/_deleted_images_';
+        if (!file_exists( $deldir )) {
+            mkdir($deldir, 0755);
         }
             
         $fn = $this->getStoreName();
         $b = basename($fn);
         if (file_exists($fn)) {
             
-            if (file_exists($dir. '/'. $b)) {
+            if (file_exists($deldir . '/'. $b)) {
                 unlink($fn);
+            } else {
+                rename($fn, $deldir .'/'. $b);
             }
-            rename($fn, $dir.'/',$b);
             
             
         }
@@ -224,7 +241,13 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $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);
+                    
                 }
             }
         }