X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=15a9101ddf5a0fffd72fb3ed4aa099e963b1341a;hb=6a8bc6c2fcbdbea677855d627d7b90d501098560;hp=21731b9124e3a17940291d9d52b2fb0429cf2764;hpb=dc87fea31701f7f43c6afab936f29c1c6de63add;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 21731b91..15a9101d 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -118,9 +118,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);
             
@@ -131,7 +132,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             }
         }
         
-        $this->getNumberOfPages($file);
+        if($this->mimetype == 'application/pdf'){
+            $this->no_of_pages = $this->getPdfPages($file);
+        }
         
         $this->filesize = filesize($file);
         $this->created = date('Y-m-d H:i:s');
@@ -194,21 +197,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);
+                    
                 }
             }
         }
@@ -767,6 +791,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $this->filesize = filesize($f);
         
+        if($this->mimetype == 'application/pdf'){
+            $this->no_of_pages = $this->getPdfPages($f);
+        }
+        
         $this->update($o);
         
         return true;
@@ -792,50 +820,34 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $base64;
     }
     
-    function getNumberOfPages()
+    function getPdfPages($file)
     {
-        $ret = false;
-        
         require_once 'System.php';
         
-        $file = $this->getStoreName();
-                
-        if(!file_exists($file)){
-            return false;
+        $page = 0;
+
+        $pdfinfo = System::which('pdfinfo');
+
+        if (!file_exists($file) || empty($pdfinfo)) {
+            return $page;
         }
-                
-        switch ($this->mimetype) {
-            
-            case 'application/pdf' :
-                
-                $pdftk = System::which('pdftk');
-                
-                if (empty($pdftk)) {
-                    return false;
-                }
-                
-                $cmd = "{$pdftk} {$file} dump_data";
-                
-                $info = `$cmd`;
-                
-                $infos = explode("\n", $info);
+        
+        $cmd = "{$pdfinfo} {$file}";
 
-                foreach ($infos as $i){
-                    
-                    if(!preg_match('/^NumberOfPages: ([0-9]+)/', $i, $matches)){
-                        continue;
-                    }
-                    
-                    $ret = (empty($matches[1])) ? false : $matches[1];
-                    break;
-                }
-                
-                break;
-            default :
-                break;
+        $ret = `$cmd`;
+
+        $info = explode("\n", $ret);
+
+        foreach ($info as $i){
+
+            if(!preg_match('/^Pages:[\s]*([0-9]+)/', $i, $matches)){
+                continue;
+            }
+            
+            $page = (empty($matches[1])) ? 0 : $matches[1];
         }
         
-        return $ret;
+        return $page;
     }
     
  }