DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 88fdd94..fa610d6 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -690,11 +690,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         $ext = $y->toExt(trim((string) $this->mimetype ));
         
         $this->filename = empty($this->filename) ? 
-            ('gen-' . date('Y-m-d H:i:s') . '.' . $ext) : ($this->filename .'.'. $ext); 
+            ('image-upload-' . date('Y-m-d H:i:s') . '.' . $ext) : ($this->filename .'.'. $ext); 
         
         if (!$this->createFromData($data)) {
             return false;
         }
+        
         return true;
          
     }
@@ -706,14 +707,13 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         if (array_shift(explode('/', $this->mimetype)) == 'image') { 
         
-            $imgs = @getimagesize($file);
+            $imgs = @getimagesize($data);
             
             if (!empty($imgs) && !empty($imgs[0]) && !empty($imgs[1])) {
                 list($this->width , $this->height)  = $imgs;
             }
         }
         
-//        $this->filesize = filesize($file);
         $this->created = date('Y-m-d H:i:s');
         
         if (!$this->id) {
@@ -732,6 +732,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         file_put_contents($f, file_get_contents("data://" . $data));
         
+        $o = clone($this);
+        
+        $this->filesize = filesize($f);
+        
+        $this->update($o);
+        
         return true;
         
     }