X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=cf4964587e36f37c7afd98e4ca745dfd55e854b1;hb=0ab9a2636212f861c9853338b36297083bee3d53;hp=343432e0dba1c0888f2c28ea8f47f442b088aad5;hpb=809c5d347a0e68899c931296167125ebae4d7f89;p=Pman.Core diff --git a/DataObjects/Images.php b/DataObjects/Images.php index 343432e0..cf496458 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; } @@ -130,6 +131,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } } + if($this->mimetype == 'application/pdf'){ + $this->no_of_pages = $this->getPdfPages($file); + } + $this->filesize = filesize($file); $this->created = date('Y-m-d H:i:s'); @@ -193,19 +198,41 @@ class Pman_Core_DataObjects_Images extends DB_DataObject */ function beforeDelete() { + + $opts = HTML_FlexyFramework::get()->Pman; + $deldir = $opts['storedir']. '/_deleted_images_'; + if (!file_exists( $deldir )) { + mkdir($dir, 0755); + } + $fn = $this->getStoreName(); + $b = basename($fn); if (file_exists($fn)) { - unlink($fn); + + if (file_exists($deldir . '/'. $b)) { + unlink($fn); + } else { + rename($fn, $deldir .'/',$b); + } + + } // delete thumbs.. - $b = basename($fn); + $d = dirname($fn); if (file_exists($d)) { $dh = opendir($d); while (false !== ($fn = readdir($dh))) { if (substr($fn, 0, strlen($b)) == $b) { - unlink($d. '/'. $fn); + + if (file_exists($deldir . '/'. $fn)) { + unlink($d. '/'. $fn); + continue; + } + rename($d. '/'. $fn, $deldir .'/',$fn); + + } } } @@ -240,6 +267,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject return false; } if ($tbl->$fld) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $image = DB_DataObject::factory('Images'); $image->get($tbl->$fld); $image->beforeDelete(); @@ -270,11 +299,23 @@ 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; } if ($this->id) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $this->beforeDelete(); } if ( empty($this->ontable)) { @@ -291,6 +332,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $img->find(); while ($img->fetch()) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $img->beforeDelete(); $img->delete(); } @@ -324,6 +367,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 +434,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; @@ -403,7 +447,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,21 +658,25 @@ 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()); + $this->addEvent($ar, $roo); $r = DB_DataObject::factory($this->tableName()); $r->id = $this->id; $roo->loadMap($r); $r->limit(1); $r->find(true); - $roo->jok($r->toArray()); } + function addEvent($ar, $roo) + { + $roo->addEvent("ADD", $this, $this->toEventString()); + } + function toEventString() { @@ -648,6 +698,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } if ($this->id) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $this->beforeDelete(); } @@ -665,6 +717,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $img->find(); while ($img->fetch()) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $img->beforeDelete(); $img->delete(); } @@ -737,10 +791,63 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $this->filesize = filesize($f); + if($this->mimetype == 'application/pdf'){ + $this->no_of_pages = $this->getPdfPages($f); + } + $this->update($o); return true; } + function toBase64() + { + if(!preg_match('/^image\//', $this->mimetype)){ + return false; + } + + $file = $this->getStoreName(); + + if(!file_exists($file)){ + return false; + } + + $data = file_get_contents($file); + + $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data); + + return $base64; + } + + function getPdfPages($file) + { + require_once 'System.php'; + + $page = 0; + + $pdfinfo = System::which('pdfinfo'); + + if (!file_exists($file) || empty($pdfinfo)) { + return $page; + } + + $cmd = "{$pdfinfo} {$file}"; + + $ret = `$cmd`; + + $info = explode("\n", $ret); + + foreach ($info as $i){ + + if(!preg_match('/^Pages:[\s]*([0-9]+)/', $i, $matches)){ + continue; + } + + $page = (empty($matches[1])) ? 0 : $matches[1]; + } + + return $page; + } + }