DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index a3d7f1a..3b72bef 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -41,9 +41,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $o = $this->object();
         //print_r($o);
-        if (method_exists($o, 'hasPerm')) {
+        if (method_exists($o, 'checkPerm')) {
             // edit permissions on related object needed...
-            return $o->hasPerm( $lvl == 'S' ? 'S' : 'E' , $au);
+            return $o->checkPerm( $lvl == 'S' ? 'S' : 'E' , $au);
             
         }
         
@@ -106,6 +106,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     {
         // copy the file into the storage area..
         if (!file_exists($file) || !filesize($file)) {
+            $this->err = "File $file did not exist or is 0 size";
             return false;
         }
         
@@ -265,12 +266,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     /// ctrl not used??
     function onUpload($roo)
     {
-//        echo $_FILES['imageUpload']['type'];exit;
+        //print_r($_FILES); echo $_FILES['imageUpload']['type'];exit;
         if (empty($_FILES['imageUpload']['tmp_name']) || 
             empty($_FILES['imageUpload']['name']) || 
             empty($_FILES['imageUpload']['type'])
         ) {
-            $this->err = "Missing file details";
+            $this->err = "Missing file details : Error=". (empty($_FILES['imageUpload']['error']) ? '?': $_FILES['imageUpload']['error']);
             return false;
         }
         
@@ -324,6 +325,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         
         if (!$this->createFrom($_FILES['imageUpload']['tmp_name'])) {
+            $this->err  =  isset($this->err)  ?  $this->err  : "createFrom Image failed";
             return false;
         }
         return true;
@@ -390,8 +392,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     }
     
      
-    function toRooArray($req = array()) {
-      //  echo '<PRE>';print_r($req);exit;
+    function toRooArray($req) {
+        
         $ret= $this->toArray();
       
         static $ff = false;
@@ -403,7 +405,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                     $ff->Pman_Images['public_baseURL'] : $ff->baseURL;
         
         if (!empty($req['query']['imagesize'])) {
-             $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : false;
+            // query/imageBaseURL ... depricated...? -- set it in config?
+            
+            $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : $ret['public_baseURL'];
             
             $ret['url'] = $this->URL(-1, '/Images/Download',$baseURL);
             
@@ -612,7 +616,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
 //        print_r(!$this->onUpload($this));
         
         if ( !$this->onUpload($this)) { 
-            $roo->jerr("File upload failed : ". (!empty($this->err) ? $this->err : ''));
+            $roo->jerr("File upload failed : error = ". (!empty($this->err) ? $this->err : ''));
         }
         
         $roo->addEvent("ADD", $this, $this->toEventString());