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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index b6a650d2..6e4c4aea 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -132,32 +132,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         if($this->mimetype == 'application/pdf'){
-            
-            require_once 'System.php';
-        
-            $this->no_of_pages = 0;
-            
-            $pdfinfo = System::which('pdfinfo');
-
-            if (!empty($pdfinfo)) {
-                
-                $cmd = "{$pdfinfo} {$file}";
-
-                $ret = `$cmd`;
-
-                $info = explode("\n", $ret);
-
-                foreach ($info as $i){
-
-                    if(!preg_match('/^Pages:[\s]*([0-9]+)/', $i, $matches)){
-                        continue;
-                    }
-                    print_R($matches);exit;
-                    $ret = (empty($matches[1])) ? false : $matches[1];
-                    break;
-                }
-            }
-            
+            $this->no_of_pages = $this->getPdfPages($file);
         }
         
         $this->filesize = filesize($file);
@@ -210,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
         ));
@@ -794,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;
@@ -819,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;
+    }
+    
  }