fix #7330 - upload cropbox padding / edit

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 1af82d6..51ba52d 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -38,6 +38,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%' OR $tn.title LIKE '%{$this->escape($q['search']['filename'])}%'
             ");
         }
+
+        if(!empty($q['_to_base64']) && !empty($q['image_id'])) {
+            $i = DB_DataObject::factory("Images");
+            $i->get($q['image_id']);
+            $roo->jok($i->toBase64());
+        }
         
 
     }
@@ -53,7 +59,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $o = $this->object();
         //print_r($o);
-        if (method_exists($o, 'checkPerm')) {
+        if ($o &&  method_exists($o, 'checkPerm')) {
             // edit permissions on related object needed...
             return $o->checkPerm( $lvl == 'S' ? 'S' : 'E' , $au);
             
@@ -203,7 +209,16 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         ));
           
     }
-     
+    
+    /**
+     * does the files exist?
+     */
+    function exists()
+    {
+        return file_exists($this->getStoreName());
+    }
+    
+    
     /**
      * deletes all the image instances of it...
      * 
@@ -212,10 +227,15 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     function beforeDelete($dependants_array, $roo)
     {
         
+        if (!empty($dependants_array)) {
+            return;
+        }
+        
         $opts = HTML_FlexyFramework::get()->Pman;
         $deldir = $opts['storedir']. '/_deleted_images_';
+        clearstatcache();
         if (!file_exists( $deldir )) {
-            mkdir($deldir, 0755);
+            @mkdir($deldir, 0755); // not sure why we are erroring here.. after checking - maybe permissions?
         }
             
         $fn = $this->getStoreName();
@@ -304,12 +324,22 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     
     // direct via roo...
     /// ctrl not used??
-    function onUpload($roo)
+    function onUpload($roo, $table = false, $file = false)
     {
+        
+        if ($table !== false) {
+            $this->ontable = $table->tableName();
+            $this->onid = $table->pid();
+        }
+        
+        if ($file === false) {
+            $file = isset($_FILES['imageUpload']) ? $_FILES['imageUpload'] : array();
+        }
+        
         //print_r($_FILES); echo $_FILES['imageUpload']['type'];exit;
-        if (empty($_FILES['imageUpload']['tmp_name']) || 
-            empty($_FILES['imageUpload']['name']) || 
-            empty($_FILES['imageUpload']['type'])
+        if (empty($file['tmp_name']) || 
+            empty($file['name']) || 
+            empty($file['type'])
         ) {
             
             $emap = array( 
@@ -320,7 +350,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 4=>"No file was uploaded",
                 6=>"Missing a temporary folder" 
             ); 
-            $estr = (empty($_FILES['imageUpload']['error']) ? '?': $emap[$_FILES['imageUpload']['error']]);
+            $estr = (empty($file['error']) ? '?': $emap[$file['error']]);
             $this->err = "Missing file details : Error=". $estr;
             return false;
         }
@@ -356,7 +386,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         require_once 'File/MimeType.php';
         $y = new File_MimeType();
-        $this->mimetype = $_FILES['imageUpload']['type'];
+        $this->mimetype = $file['type'];
         if (in_array($this->mimetype, array(
                         'text/application',
                         'application/octet-stream',
@@ -366,7 +396,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                         'application/vnd.ms-excel',   /// sometimes windows reports csv as excel???
                         'application/csv-tab-delimited-table', // windows again!!?
                 ))) { // weird tyeps..
-            $inf = pathinfo($_FILES['imageUpload']['name']);
+            $inf = pathinfo($file['name']);
             $this->mimetype  = $y->fromExt($inf['extension']);
         }
         
@@ -374,11 +404,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         $ext = $y->toExt(trim((string) $this->mimetype ));
         
         $this->filename = empty($this->filename) ? 
-            $_FILES['imageUpload']['name'] : ($this->filename .'.'. $ext); 
+            $file['name'] : ($this->filename .'.'. $ext); 
         
         
         
-        if (!$this->createFrom($_FILES['imageUpload']['tmp_name'])) {
+        if (!$this->createFrom($file['tmp_name'])) {
             $this->err  =  isset($this->err)  ?  $this->err  : "createFrom Image failed";
             return false;
         }
@@ -490,6 +520,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if (!$this->id) {
             return 'about:blank';
         }
+        if (!$this->exists()) {
+            return 'about:missing';
+        }
         
         $shorten_name = $this->shorten_name();
         
@@ -509,9 +542,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         //$size = min(1024, (int) $size);
         // the size should 200x150 to convert
         $sizear = preg_split('/(x|c)/', $size);
-        if(empty($sizear[1])){
-            $sizear[1] = 0;
+        if(!isset($sizear[1])){
+            $sizear[1] =   0; // 0x with '0' is a box? why
         }
+        
         $size = implode(strpos($size,'c') > -1 ? 'c' : 'x', $sizear);
 //        print_r($size);
         $fc = $this->toFileConvert();
@@ -573,7 +607,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      * 
      * 
      */
-    function toHTML($size, $provider = '/Images/Thumb') 
+    function toHTML($size, $provider = '/Images/Thumb', $extra = '') 
     {
         
         
@@ -588,12 +622,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         if (empty($sz[1])) {
             $ratio =  empty($this->width) ? 1 : $this->height/ ($this->width *1.0);
-            $sy = $ratio * $sx;
+            $sy = intval($ratio * $sx);
         } else {
             $sy = $sz[1];
         }
         // create it?
-        $extra = '';
+       
         if (strlen($this->title)) {
             $extra = ' title="'. htmlspecialchars($this->title) . '"';
         }
@@ -815,13 +849,31 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     function createFromData($data)
     {   
         
-        $this->mimetype= strtolower($this->mimetype);
+        if (0 === strpos($data, "data:")) {
+            // data:image/png;base64, 
+            $data = substr($data,5);
+            $bits = explode(";", $data);
+            $this->mimetype = $bits[0];
+        }
+        static $imgid = 1;
+        if (empty($this->filename)) {
+            require_once 'File/MimeType.php';
+            $y = new File_MimeType();
+            $this->filename = 'image-'.$imgid++.'.'.$y->toExt($this->mimetype);
+        }
+        
+        
+        $this->mimetype = strtolower($this->mimetype);
+        if ($this->mimetype == 'image/jpg') {
+            $this->mimetype = 'image/jpeg';
+        }
+        
         
         $explode_mimetype = explode('/', $this->mimetype);
         
         if (array_shift($explode_mimetype) == 'image') { 
         
-            $imgs = @getimagesize($data);
+            $imgs = @getimagesize('data://'. $data);
             
             if (!empty($imgs) && !empty($imgs[0]) && !empty($imgs[1])) {
                 list($this->width , $this->height)  = $imgs;
@@ -845,7 +897,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         file_put_contents($f, file_get_contents("data://" . $data));
-        
+        //var_dump($f);exit;
         $o = clone($this);
         
         $this->filesize = filesize($f);
@@ -867,7 +919,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         $file = $this->getStoreName();
-        
+
         if(!file_exists($file)){
             return false;
         }