X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=127c66d364d81996abba143f58a1defd0d493514;hb=e5c38808cb656701768c5a61dc1d54628bb7e8ab;hp=b52bfbb19990e73ec7f4089984ad28331fc32456;hpb=0e3517a2efb3722ffe286911d2bce71605cb76a9;p=Pman.Core diff --git a/DataObjects/Images.php b/DataObjects/Images.php index b52bfbb1..127c66d3 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 { @@ -30,23 +30,20 @@ class Pman_Core_DataObjects_Images extends DB_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function checkPerm($perm, $au) + function checkPerm($lvl, $au) { // default permissons are to // allow create / edit / if the user has if (!$au) { - - - return false; } $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( $perm == 'S' ? 'S' : 'E' , $au); + return $o->checkPerm( $lvl == 'S' ? 'S' : 'E' , $au); } @@ -109,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; } @@ -243,6 +241,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(); @@ -268,16 +268,28 @@ 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"; + + $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)) { @@ -294,6 +306,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(); } @@ -327,6 +341,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; @@ -393,8 +408,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; @@ -406,7 +421,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); @@ -615,10 +632,10 @@ 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; @@ -629,6 +646,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } + function addEvent($ar, $roo) + { + $roo->addEvent("ADD", $this, $this->toEventString()); + } + function toEventString() { @@ -650,6 +672,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } if ($this->id) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $this->beforeDelete(); } @@ -658,6 +682,23 @@ class Pman_Core_DataObjects_Images extends DB_DataObject return false; } + if (!empty($this->imgtype) && $this->imgtype[0] == '-' && !empty($this->onid)) { + // then its an upload + $img = DB_DataObject::factory('Images'); + $img->onid = $this->onid; + $img->ontable = $this->ontable; + $img->imgtype = $this->imgtype; + + $img->find(); + while ($img->fetch()) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; + $img->beforeDelete(); + $img->delete(); + } + + } + require_once 'File/MimeType.php'; $y = new File_MimeType(); @@ -676,8 +717,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $ext = $y->toExt(trim((string) $this->mimetype )); - $this->filename = empty($this->filename) ? - ('image-upload-' . date('Y-m-d H:i:s') . '.' . $ext) : ($this->filename); + if(array_pop(explode('.', $this->filename)) != $ext){ + $this->filename = $this->filename .'.'. $ext; + } if (!$this->createFromData($data)) { return false; @@ -729,4 +771,69 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } + 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 getNumberOfPages() + { + $ret = false; + + require_once 'System.php'; + + switch ($this->mimetype) { + + case 'application/pdf' : + + $file = $this->getStoreName(); + + if(!file_exists($file)){ + return false; + } + + $pdftk = System::which('pdftk'); + + if (empty($pdftk)) { + return false; + } + + $cmd = "{$pdftk} {$file} dump_data"; + + $info = `$cmd`; + + $infos = explode("\n", $info); + + foreach ($infos as $i){ + + if(!preg_match('/^NumberOfPages: ([0-9]+)/', $i, $matches)){ + continue; + } + + $ret = (empty($matches[1])) ? false : $matches[1]; + break; + } + + break; + default : + break; + } + + return $ret; + } + }