X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=9b5f666cecd6083e48f1a5a79cb0f916ccaa6a9d;hb=44e8cf08fa923109c411e3f483c5f3710b7c1d81;hp=1b3cf84c3da9aa04f4162b89f80927419a32f413;hpb=2f2b0eb9fd875030e33b6363db98b5ad5172c5d3;p=Pman.Core diff --git a/DataObjects/Images.php b/DataObjects/Images.php index 1b3cf84c..9b5f666c 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -29,6 +29,20 @@ 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.name LIKE '%{$this->escape($q['search']['filename'])}%' + OR + $tn.subject LIKE '%{$this->escape($q['search']['filename'])}%' + "); + } + + + } function checkPerm($lvl, $au) { @@ -118,7 +132,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $this->mimetype = $y->fromFilename($filename); } - $this->mimetype= strtolower($this->mimetype); + $this->mimetype = strtolower($this->mimetype); $mta = explode('/', $this->mimetype); if (array_shift($mta) == 'image') { @@ -213,7 +227,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject if (file_exists($deldir . '/'. $b)) { unlink($fn); } else { - rename($fn, $deldir .'/',$b); + rename($fn, $deldir .'/'. $b); } @@ -231,8 +245,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject unlink($d. '/'. $fn); continue; } - rename($d. '/'. $fn, $deldir .'/',$fn); - + rename($d. '/'. $fn, $deldir .'/'. $fn); } }