DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 88fdd94..3f71ed6 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -659,6 +659,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         if (!empty($this->imgtype) && $this->imgtype[0] == '-' && !empty($this->onid)) {
+            // then its an upload 
             $img  = DB_DataObject::factory('Images');
             $img->onid = $this->onid;
             $img->ontable = $this->ontable;
@@ -669,6 +670,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 $img->beforeDelete();
                 $img->delete();
             }
+            
         }
         
         require_once 'File/MimeType.php';
@@ -689,12 +691,14 @@ 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); 
+        if(array_pop(explode('.', $this->filename)) != $ext){
+            $this->filename = $this->filename .'.'. $ext; 
+        }
         
         if (!$this->createFromData($data)) {
             return false;
         }
+        
         return true;
          
     }
@@ -706,14 +710,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 +735,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;
         
     }