X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;ds=sidebyside;f=DataObjects%2FImages.php;h=98a6f8159abad63d32f73ea99fe83d382eec2a07;hb=5d4ac076dc4f620fbb91944eead3e0af66216a03;hp=deead499ee5135b9486d758c2360bcf58733214d;hpb=d1cddca1b548c9fbba9f18b4ce3004bf2abf86f4;p=Pman.Core diff --git a/DataObjects/Images.php b/DataObjects/Images.php index deead499..98a6f815 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -2,7 +2,7 @@ /** * Table Definition for Images */ -require_once 'DB/DataObject.php'; +class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php'; class Pman_Core_DataObjects_Images extends DB_DataObject { @@ -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; } @@ -148,7 +149,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $f = $this->getStoreName(); - print_R($f);exit; $dest = dirname($f); if (!file_exists($dest)) { // currently this is 0775 due to problems using shared hosing (FTP) @@ -271,7 +271,17 @@ class Pman_Core_DataObjects_Images extends DB_DataObject empty($_FILES['imageUpload']['name']) || empty($_FILES['imageUpload']['type']) ) { - $this->err = "Missing file details"; + + $emap = array( + 0=>"There is no error, the file uploaded with success", + 1=>"The uploaded file exceeds the upload_max_filesize directive in php.ini", + 2=>"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" , + 3=>"The uploaded file was only partially uploaded", + 4=>"No file was uploaded", + 6=>"Missing a temporary folder" + ); + $estr = (empty($_FILES['imageUpload']['error']) ? '?': $emap[$_FILES['imageUpload']['error']]); + $this->err = "Missing file details : Error=". $estr; return false; } @@ -325,6 +335,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; @@ -391,8 +402,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } - function toRooArray($req = array()) { - // echo '
';print_r($req);exit; + function toRooArray($req) { + $ret= $this->toArray(); static $ff = false; @@ -404,7 +415,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); @@ -613,7 +626,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());