X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=4c4feed813aca2f3db53baf049b61a7866dc06f9;hb=b66a2cb9fd3ac855b09245f03d174c4eb93c20c1;hp=127c66d364d81996abba143f58a1defd0d493514;hpb=e5c38808cb656701768c5a61dc1d54628bb7e8ab;p=Pman.Core diff --git a/DataObjects/Images.php b/DataObjects/Images.php index 127c66d3..4c4feed8 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -29,6 +29,18 @@ class Pman_Core_DataObjects_Images extends DB_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + function applyFilters($q, $au, $roo) + { + $tn = $this->tableName(); + + if(!empty($q['search']['filename'])){ + $this->whereAdd(" + $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%' OR $tn.title LIKE '%{$this->escape($q['search']['filename'])}%' + "); + } + + + } function checkPerm($lvl, $au) { @@ -118,9 +130,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $this->mimetype = $y->fromFilename($filename); } - $this->mimetype= strtolower($this->mimetype); + $this->mimetype = strtolower($this->mimetype); - if (array_shift(explode('/', $this->mimetype)) == 'image') { + $mta = explode('/', $this->mimetype); + if (array_shift($mta) == 'image') { $imgs = @getimagesize($file); @@ -131,6 +144,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'); @@ -192,21 +209,42 @@ class Pman_Core_DataObjects_Images extends DB_DataObject * * */ - function beforeDelete() + function beforeDelete($dependants_array, $roo) { + + $opts = HTML_FlexyFramework::get()->Pman; + $deldir = $opts['storedir']. '/_deleted_images_'; + if (!file_exists( $deldir )) { + mkdir($deldir, 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); + } } } @@ -266,12 +304,22 @@ class Pman_Core_DataObjects_Images extends DB_DataObject // direct via roo... /// ctrl not used?? - function onUpload($roo) + function onUpload($roo, $table = false, $file = false) { + + if ($table !== false) { + $this->ontable = $table->tableName(); + $this->onid = $table->pid(); + } + + if ($file === false) { + $file = isset($_FILES['imageUpload']) ? $_FILES['imageUpload'] : array(); + } + //print_r($_FILES); echo $_FILES['imageUpload']['type'];exit; - if (empty($_FILES['imageUpload']['tmp_name']) || - empty($_FILES['imageUpload']['name']) || - empty($_FILES['imageUpload']['type']) + if (empty($file['tmp_name']) || + empty($file['name']) || + empty($file['type']) ) { $emap = array( @@ -282,7 +330,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject 4=>"No file was uploaded", 6=>"Missing a temporary folder" ); - $estr = (empty($_FILES['imageUpload']['error']) ? '?': $emap[$_FILES['imageUpload']['error']]); + $estr = (empty($file['error']) ? '?': $emap[$file['error']]); $this->err = "Missing file details : Error=". $estr; return false; } @@ -318,7 +366,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject require_once 'File/MimeType.php'; $y = new File_MimeType(); - $this->mimetype = $_FILES['imageUpload']['type']; + $this->mimetype = $file['type']; if (in_array($this->mimetype, array( 'text/application', 'application/octet-stream', @@ -328,7 +376,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject 'application/vnd.ms-excel', /// sometimes windows reports csv as excel??? 'application/csv-tab-delimited-table', // windows again!!? ))) { // weird tyeps.. - $inf = pathinfo($_FILES['imageUpload']['name']); + $inf = pathinfo($file['name']); $this->mimetype = $y->fromExt($inf['extension']); } @@ -336,11 +384,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $ext = $y->toExt(trim((string) $this->mimetype )); $this->filename = empty($this->filename) ? - $_FILES['imageUpload']['name'] : ($this->filename .'.'. $ext); + $file['name'] : ($this->filename .'.'. $ext); - if (!$this->createFrom($_FILES['imageUpload']['tmp_name'])) { + if (!$this->createFrom($file['tmp_name'])) { $this->err = isset($this->err) ? $this->err : "createFrom Image failed"; return false; } @@ -408,14 +456,14 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } - function toRooArray($req) { + function toRooArray($req) + { $ret= $this->toArray(); - static $ff = false; - if (!$ff) { - $ff = HTML_FlexyFramework::get(); - } + + $ff = HTML_FlexyFramework::get(); + $ret['public_baseURL'] = isset($ff->Pman_Images['public_baseURL']) ? $ff->Pman_Images['public_baseURL'] : $ff->baseURL; @@ -432,10 +480,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject if (!empty($req['query']['imagesize'])) { $ret['url_thumb'] = $this->URL($req['query']['imagesize'], '/Images/Thumb',$baseURL); } + + } + $ret['shorten_name'] = $ret['filename'] = $this->shorten_name(); - - return $ret; } @@ -450,9 +499,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject { if (!$this->id) { return 'about:blank'; - } - + + $shorten_name = $this->shorten_name(); + $ff = HTML_FlexyFramework::get(); $baseURL = $baseURL ? $baseURL : $ff->baseURL ; if (preg_match('#^http[s]*://#', $provider)) { @@ -462,7 +512,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject if ($size < 0) { $provider = preg_replace('#/Thumb$#', '', $provider); - return $baseURL . $provider . "/{$this->id}/{$this->filename}"; + return $baseURL . $provider . "/{$this->id}/{$shorten_name}"; // -- this breaks the rss feed #image-{$this->id}"; } //-- max? //$size = max(100, (int) $size); @@ -484,7 +534,49 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $fc->convert($mt, $size); - return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}"; + return $baseURL . $provider . "/$size/{$this->id}/{$shorten_name}"; // -- this breaks the rss feed #image-{$this->id}"; + } + + function getFromHashURL($url) + { + $id = false; + if (preg_match('/#image-([0-9]+)$/', $url, $matches)) { + $id = $matches[1]; + } else if (preg_match('#Images/Thumb/[^/]+/([0-9]+)/#', $url, $matches)) { + $id = $matches[1]; + } else if (preg_match('#Images/([0-9]+)/#', $url, $matches)) { + $id = $matches[1]; + } + + if ($id === false || $id < 1) { + return false; + } + + $img = DB_DAtaObject::Factory('images'); + if ($img->get($id)) { + return $img; + } + return false; + } + + + function shorten_name() + { + if(empty($this->filename)) { + return; + } + + $filename = explode('.', $this->filename); + $ext = array_pop($filename); + $name = preg_replace("/[^A-Z0-9.]+/i", '-', implode('-', $filename)) ; + + if(strlen($name) > 32) { + $name = substr($name, 0, 32); + } + + $shorten_name = "{$name}.{$ext}"; + + return $shorten_name; } /** * size could be 123x345 @@ -602,11 +694,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $roo->addEvent("ADD", $this, $this->toEventString()); $r = DB_DataObject::factory($this->tableName()); + $r->id = $this->id; $roo->loadMap($r); $r->limit(1); $r->find(true); - $roo->jok($r->toArray()); + $roo->jok($r->toRooArray($ar)); } @@ -621,8 +714,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject if (!$this->checkPerm($this->id ? 'A' : 'E', $roo->authUser)) { $roo->jerr("IMAGE UPLOAD PERMISSION DENIED"); } - - + if (!isset($_FILES['imageUpload'])) { return; // standard update... @@ -642,7 +734,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $roo->loadMap($r); $r->limit(1); $r->find(true); - $roo->jok($r->toArray()); + $roo->jok($r->toRooArray($ar)); } @@ -717,7 +809,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $ext = $y->toExt(trim((string) $this->mimetype )); - if(array_pop(explode('.', $this->filename)) != $ext){ + $explode_filename = explode('.', $this->filename); + if(array_pop($explode_filename) != $ext){ $this->filename = $this->filename .'.'. $ext; } @@ -734,7 +827,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $this->mimetype= strtolower($this->mimetype); - if (array_shift(explode('/', $this->mimetype)) == 'image') { + $explode_mimetype = explode('/', $this->mimetype); + + if (array_shift($explode_mimetype) == 'image') { $imgs = @getimagesize($data); @@ -765,13 +860,17 @@ 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() + function toBase64($rotate = false, $scaleWidth = 0, $scaleHeight = 0) { if(!preg_match('/^image\//', $this->mimetype)){ return false; @@ -785,55 +884,90 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $data = file_get_contents($file); + if(!empty($scaleWidth) || !empty($scaleHeight)){ + $data = $this->scale(false, $scaleWidth, $scaleHeight); + } + + if($rotate){ + $data = $this->rotate($data); + } + $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data); return $base64; } - function getNumberOfPages() + function getPdfPages($file) { - $ret = false; - require_once 'System.php'; - switch ($this->mimetype) { + $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; + } - 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); + $page = (empty($matches[1])) ? 0 : $matches[1]; + } + + return $page; + } + + function rotate($imageBlob = false) + { + if(empty($imageBlob)){ + $imagick = new Imagick($this->getStoreName()); + } else { + $imagick = new Imagick(); + $imagick->readImageBlob($imageBlob); + } + + $orientation = $imagick->getImageOrientation(); + + switch($orientation) { + case Imagick::ORIENTATION_BOTTOMRIGHT: + $imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees + break; - foreach ($infos as $i){ - - if(!preg_match('/^NumberOfPages: ([0-9]+)/', $i, $matches)){ - continue; - } - - $ret = (empty($matches[1])) ? false : $matches[1]; - break; - } - - break; - default : - break; + case Imagick::ORIENTATION_RIGHTTOP: + $imagick->rotateimage(new ImagickPixel('#00000000'), 90); // rotate 90 degrees CW + break; + + case Imagick::ORIENTATION_LEFTBOTTOM: + $imagick->rotateimage(new ImagickPixel('#00000000'), -90); // rotate 90 degrees CCW + break; } - return $ret; + return $imagick->getImageBlob(); + } + + function scale($imageBlob = false, $width = 0, $height = 0) + { + if(empty($imageBlob)){ + $imagick = new Imagick($this->getStoreName()); + } else { + $imagick = new Imagick(); + $imagick->readImageBlob($imageBlob); + } + + $imagick->resizeimage($width, $height, Imagick::FILTER_LANCZOS, true, true); + + return $imagick->getImageBlob(); + } }