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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index f1ae557e..cf496458 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -131,6 +131,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             }
         }
         
+        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,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);
+                    
+                    
                 }
             }
         }
@@ -635,7 +661,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $roo->jerr("File upload failed : error = ". (!empty($this->err) ? $this->err : ''));
         }
         
-        $roo->addEvent("ADD", $this, $this->toEventString());
+        $this->addEvent($ar, $roo);
         
         $r = DB_DataObject::factory($this->tableName());
         $r->id = $this->id;
@@ -646,6 +672,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
          
     }
     
+    function addEvent($ar, $roo)
+    {
+        $roo->addEvent("ADD", $this, $this->toEventString());
+    }
+    
     function toEventString()
     {
         
@@ -760,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;
@@ -778,9 +813,41 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             return false;
         }
         
-        $type = pathinfo($file, PATHINFO_EXTENSION);
-        $data = file_get_contents($path);
-        $base64 = 'data:image/' . $type . ';base64,' . base64_encode($data);
+        $data = file_get_contents($file);
+        
+        $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
+        
+        return $base64;
+    }
+    
+    function getPdfPages($file)
+    {
+        require_once 'System.php';
+        
+        $page = 0;
+
+        $pdfinfo = System::which('pdfinfo');
+
+        if (!file_exists($file) || empty($pdfinfo)) {
+            return $page;
+        }
+        
+        $cmd = "{$pdfinfo} {$file}";
+
+        $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 $page;
     }
     
  }