Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index b4ea3fc..446fda1 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -26,7 +26,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     public $linkurl;                         // string(254)  not_null
     public $descript;                        // blob(65535)  not_null blob
     public $title;                           // string(128)  not_null
-
     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -35,14 +34,13 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     {
         // default permissons are to
         // allow create / edit / if the user has
+        
         if (!$au) {
             
           
             
             return false;
         }
-         
-        
         
         $o = $this->object();
         //print_r($o);
@@ -150,7 +148,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         ));
           
     }
-
      
     /**
      * deletes all the image instances of it...
@@ -228,6 +225,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     }
     
     // direct via roo...
+    /// ctrl not used??
     function onUpload($ctrl)
     {
         
@@ -287,6 +285,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
          
     }
      
+    
+    
     /**
      * return a list of images for an object, optionally with a mime regex.
      * eg. '%/pdf' or 'image/%'
@@ -348,7 +348,14 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
       //  echo '<PRE>';print_r($req);exit;
         $ret= $this->toArray();
       
-      
+        static $ff = false;
+        if (!$ff) {
+            $ff = HTML_FlexyFramework::get();
+        }
+        
+        $ret['public_baseURL'] = isset($ff->Pman_Images['public_baseURL']) ?
+                    $ff->Pman_Images['public_baseURL'] : $ff->baseURL;
+        
         if (!empty($req['query']['imagesize'])) {
              $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : false;
             
@@ -385,8 +392,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if (preg_match('#^http[s]*://#', $provider)) {
             $baseURL = '';
         }
-        
+       
         if ($size < 0) {
+            $provider = preg_replace('#/Thumb$#', '', $provider);
+            
             return $baseURL . $provider . "/{$this->id}/{$this->filename}";
         }
         //-- max?
@@ -421,9 +430,32 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $sy = $sz[1];
         }
         // create it?
+         
+        return '<img src="' . $this->URL($size, $provider) . '" width="'. $sx . '" height="'. $sy . '">';
         
         
-        return '<img src="' . $this->URL($size, $provider) . '" width="'. $sx . '" height="'. $sy . '">';
+    }
+     
+    /**
+     * to Fileconvert object..
+     *
+     *
+     *
+     */
+    function toFileConvert()
+    {
+        require_once 'File/Convert.php';
+        $fc = new File_Convert($this->getStoreName(), $this->mimetype);
+        return $fc;
+        
+    }
+    
+    function fileExt()
+    {
+        require_once 'File/MimeType.php';
+        
+        $y = new File_MimeType();
+        return  $y->toExt($this->mimetype);
         
         
     }