DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 0f63f5e..154067b 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -96,32 +96,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $roo->jok($r->URL(-1,'/Images') . '#attachment-'.  $r->id);
         }
         
-        if(isset($q['_auto_save'])){
-            require_once 'System.php';
-            
-            $tmpdir  = System::mktemp("-d auto_save");
-            
-            $path = $tmpdir . '/' . time();
-            
-            $source = array(
-                'source' => $q['_source']
-            );
-            
-//            if(!file_exists($path)){
-//               file_put_contents($path, $q['_source']); 
-//            }
-//            
-//            $this->setFrom($q);
-//            
-//            if (!$this->createFrom($path)) {
-//                $roo->jerr("error on auto save making image");
-//            }
-//            
-//            $roo->addEvent("AUTOSAVE", $this, $this->toEventString());
-            
-            $this->jok("OK");
-        }
-        
     }
     
      
@@ -389,6 +363,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if (!empty($mime_like)) {
             $c->whereAdd("Images.mimetype LIKE '". $c->escape($mime_like) ."'");
         }
+        $c->orderBy('created DESC');
 
         return $c->fetchAll();
     }
@@ -485,8 +460,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         $fc = $this->toFileConvert();
 //        print_r($size);
 //        exit;
-        $fc->convert($this->mimetype, $size);
+        $mt = $this->mimetype;
+        if (!preg_match('#^image/#i',$mt)) {
+            $mt = 'image/jpeg';
+        }
         
+        $fc->convert($mt, $size);
         
         return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}";
     }
@@ -663,4 +642,70 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         //$p->toEventString();
     }
     
+    function onUploadFromData($data, $roo)
+    {
+        if (empty($data)) {
+            $this->err = "Missing file details";
+            return false;
+        }
+        
+        if ($this->id) {
+            $this->beforeDelete();
+        }
+        
+        if (empty($this->ontable)) {
+            $this->err = "Missing  ontable";
+            return false;
+        }
+        
+        if (!$this->createFromData($data)) {
+            return false;
+        }
+        
+        return true;
+         
+    }
+    
+    function createFromData($data)
+    {   
+        
+        $this->mimetype= strtolower($this->mimetype);
+        
+        if (array_shift(explode('/', $this->mimetype)) == 'image') { 
+        
+            $imgs = @getimagesize($data);
+            
+            if (!empty($imgs) && !empty($imgs[0]) && !empty($imgs[1])) {
+                list($this->width , $this->height)  = $imgs;
+            }
+        }
+        
+        $this->created = date('Y-m-d H:i:s');
+        
+        if (!$this->id) {
+            $this->insert();
+        } else {
+            $this->update();
+        }
+        
+        $f = $this->getStoreName();
+        $dest = dirname($f);
+        if (!file_exists($dest)) {
+            $oldumask = umask(0);
+            mkdir($dest, 0775, true);
+            umask($oldumask);  
+        }
+        
+        file_put_contents($f, file_get_contents("data://" . $data));
+        
+        $o = clone($this);
+        
+        $this->filesize = filesize($f);
+        
+        $this->update($o);
+        
+        return true;
+        
+    }
+    
  }