fix #7165 - language on email dialog

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 4c4feed..39171b1 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -203,7 +203,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 +221,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();
@@ -500,6 +514,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();
         
@@ -825,13 +842,27 @@ 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);
         
         $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;
@@ -855,7 +886,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);