X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=8f86797d644aad889111f589aca4853c98ec748a;hb=92692ec3f797964780e2b5cf90b211b15c1c1cb0;hp=b6a650d270fe040a3cde52188476029188a7b007;hpb=1d50bf3b4c319655f5f771c6982446e13629df20;p=Pman.Core diff --git a/DataObjects/Images.php b/DataObjects/Images.php index b6a650d2..8f86797d 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'])}%' + "); + } + + + } 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); @@ -132,32 +145,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } if($this->mimetype == 'application/pdf'){ - - require_once 'System.php'; - - $this->no_of_pages = 0; - - $pdfinfo = System::which('pdfinfo'); - - if (!empty($pdfinfo)) { - - $cmd = "{$pdfinfo} {$file}"; - - $ret = `$cmd`; - - $info = explode("\n", $ret); - - foreach ($info as $i){ - - if(!preg_match('/^Pages:[\s]*([0-9]+)/', $i, $matches)){ - continue; - } - print_R($matches);exit; - $ret = (empty($matches[1])) ? false : $matches[1]; - break; - } - } - + $this->no_of_pages = $this->getPdfPages($file); } $this->filesize = filesize($file); @@ -221,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); + } } } @@ -794,6 +803,10 @@ 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; @@ -819,4 +832,34 @@ class Pman_Core_DataObjects_Images extends DB_DataObject 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; + } + }