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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 5e3999cf..6e4c4aea 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -131,7 +131,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');
@@ -183,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
         ));
@@ -767,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;
@@ -792,51 +801,34 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $base64;
     }
     
-    function getNumberOfPages($file)
+    function getPdfPages($file)
     {
         require_once 'System.php';
         
-        $this->no_of_pages = 0;
-          
-        if(!file_exists($file)){
-            return;
+        $page = 0;
+
+        $pdfinfo = System::which('pdfinfo');
+
+        if (!file_exists($file) || empty($pdfinfo)) {
+            return $page;
         }
         
-        /*
-         * We handle pdf only at present
-         */
-        switch ($this->mimetype) {
-            
-            case 'application/pdf' :
-                
-                $pdfinfo = System::which('pdfinfo');
-                
-                if (empty($pdfinfo)) {
-                    return false;
-                }
-                
-                $cmd = "{$pdfinfo} {$file}";
-                
-                $info = `$cmd`;
-                
-                $infos = explode("\n", $info);
+        $cmd = "{$pdfinfo} {$file}";
 
-                foreach ($infos as $i){
-                    
-                    if(!preg_match('/^Pages:[\s]?([0-9]+)/', $i, $matches)){
-                        continue;
-                    }
-                    print_R($matches);exit;
-                    $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;
+        return $page;
     }
     
  }