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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 9e3d10d1..6e4c4aea 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');
          
@@ -181,6 +185,9 @@ 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
         ));
@@ -606,7 +613,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $roo->loadMap($r);
             $r->limit(1);
             $r->find(true);
-            $roo->jdata($r->toArray());
+            $roo->jok($r->toArray());
             
             
         }
@@ -635,17 +642,22 @@ 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;
         $roo->loadMap($r);
         $r->limit(1);
         $r->find(true);
-        $roo->jdata($r->toArray());
+        $roo->jok($r->toArray());
          
     }
     
+    function addEvent($ar, $roo)
+    {
+        $roo->addEvent("ADD", $this, $this->toEventString());
+    }
+    
     function toEventString()
     {
         
@@ -760,6 +772,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;
@@ -785,4 +801,34 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         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;
+    }
+    
  }