DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 66a63cb..8b63faa 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -96,28 +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();
-            
-            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");
-        }
-        
     }
     
      
@@ -131,7 +109,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     {
         // copy the file into the storage area..
         if (!file_exists($file) || !filesize($file)) {
-            print_r('errror?????');exit;
             return false;
         }
         
@@ -386,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();
     }
@@ -482,9 +460,13 @@ 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 'run??';
         return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}";
     }
     /**