DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 0f868fc..d1c6faa 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -82,6 +82,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 $roo->jerr("erro making image" . $q['_remote_upload']);
             }
             
+            if(!empty($q['_return_after_create'])){
+                return;
+            }
+            
             $roo->addEvent("ADD", $this, $this->toEventString());
         
             $r = DB_DataObject::factory($this->tableName());
@@ -94,7 +98,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
     }
     
-    
+     
     /**
      * create an email from file.
      * these must have been set first.
@@ -107,7 +111,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if (!file_exists($file) || !filesize($file)) {
             return false;
         }
-        print_r($file);exit;
+        
         $filename = empty($filename) ? $file : $filename;
         
         if (empty($this->mimetype)) {
@@ -148,7 +152,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $f = $this->getStoreName();
         $dest = dirname($f);
-        
         if (!file_exists($dest)) {
             // currently this is 0775 due to problems using shared hosing (FTP)
             // it makes all the files unaccessable..
@@ -158,7 +161,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             mkdir($dest, 0775, true);
             umask($oldumask);  
         }
-        print_r($file);exit;
+        
         copy($file,$f);
         
         // fill in details..
@@ -354,12 +357,13 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         $c = clone($this);
-        $c->ontable = $obj->tableName();
+        $c->whereAddIn($this->tableName() . '.ontable', array( $obj->tableName(), $obj->__table) , 'string');
         $c->onid = $obj->id;
         $c->autoJoin();
         if (!empty($mime_like)) {
             $c->whereAdd("Images.mimetype LIKE '". $c->escape($mime_like) ."'");
         }
+        $c->orderBy('created DESC');
 
         return $c->fetchAll();
     }
@@ -456,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}";
     }
@@ -498,7 +506,25 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         
     }
-     
+    
+    /**
+     * 
+     * #2142 [new] CMS - image link urls
+     * 
+     * 
+     * 
+     */
+    function toLinkHTML($size, $provider = '/Images/Thumb')
+    {
+        if(empty($this->linkurl)){
+            return $this->toHTML($size, $provider = '/Images/Thumb');
+        }
+        
+        return '<a href="'.$this->linkurl.'" target="_blank">'.$this->toHTML($size, $provider = '/Images/Thumb').'</a>';
+        
+    }
+    
+    
     /**
      * to Fileconvert object..
      *