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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index d822f501..15a9101d 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Images
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Images extends DB_DataObject 
 {
@@ -106,6 +106,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     {
         // copy the file into the storage area..
         if (!file_exists($file) || !filesize($file)) {
+            $this->err = "File $file did not exist or is 0 size";
             return false;
         }
         
@@ -117,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);
             
@@ -130,6 +132,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');
          
@@ -191,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);
+                    
                 }
             }
         }
@@ -240,6 +267,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             return false;
         }
         if ($tbl->$fld) {
+            HTML_FlexyFramework::get()->page->jerr("updating images is disabled");
+            exit;
             $image = DB_DataObject::factory('Images');
             $image->get($tbl->$fld);
             $image->beforeDelete();
@@ -270,11 +299,23 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             empty($_FILES['imageUpload']['name']) || 
             empty($_FILES['imageUpload']['type'])
         ) {
-            $this->err = "Missing file details";
+            
+            $emap = array( 
+                0=>"There is no error, the file uploaded with success", 
+                1=>"The uploaded file exceeds the upload_max_filesize directive in php.ini", 
+                2=>"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" ,
+                3=>"The uploaded file was only partially uploaded",
+                4=>"No file was uploaded",
+                6=>"Missing a temporary folder" 
+            ); 
+            $estr = (empty($_FILES['imageUpload']['error']) ? '?': $emap[$_FILES['imageUpload']['error']]);
+            $this->err = "Missing file details : Error=". $estr;
             return false;
         }
         
         if ($this->id) {
+            HTML_FlexyFramework::get()->page->jerr("updating images is disabled");
+            exit;
             $this->beforeDelete();
         }
         if ( empty($this->ontable)) {
@@ -291,6 +332,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
             $img->find();
             while ($img->fetch()) {
+                HTML_FlexyFramework::get()->page->jerr("updating images is disabled");
+                exit;
                 $img->beforeDelete();
                 $img->delete();
             }
@@ -324,6 +367,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         
         if (!$this->createFrom($_FILES['imageUpload']['tmp_name'])) {
+            $this->err  =  isset($this->err)  ?  $this->err  : "createFrom Image failed";
             return false;
         }
         return true;
@@ -390,8 +434,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     }
     
      
-    function toRooArray($req = array()) {
-        echo '<PRE>';print_r($req);exit;
+    function toRooArray($req) {
+        
         $ret= $this->toArray();
       
         static $ff = false;
@@ -614,10 +658,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
 //        print_r(!$this->onUpload($this));
         
         if ( !$this->onUpload($this)) { 
-            $roo->jerr("File upload failed : ". (!empty($this->err) ? $this->err : ''));
+            $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;
@@ -628,6 +672,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
          
     }
     
+    function addEvent($ar, $roo)
+    {
+        $roo->addEvent("ADD", $this, $this->toEventString());
+    }
+    
     function toEventString()
     {
         
@@ -649,6 +698,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         if ($this->id) {
+            HTML_FlexyFramework::get()->page->jerr("updating images is disabled");
+            exit;
             $this->beforeDelete();
         }
         
@@ -666,6 +717,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
             $img->find();
             while ($img->fetch()) {
+                HTML_FlexyFramework::get()->page->jerr("updating images is disabled");
+                exit;
                 $img->beforeDelete();
                 $img->delete();
             }
@@ -738,10 +791,63 @@ 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;
         
     }
     
+    function toBase64()
+    {
+        if(!preg_match('/^image\//', $this->mimetype)){
+            return false;
+        }
+        
+        $file = $this->getStoreName();
+        
+        if(!file_exists($file)){
+            return false;
+        }
+        
+        $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;
+    }
+    
  }