bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:47:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

displaying messages marked for deletion grayed out

Browse Source
This commit is contained in:
SJ
2015-07-09 13:56:11 +02:00
parent db578ea6d0
commit 88f3197605
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webui/model/search/search.php
View File

@ -532,7 +532,7 @@ class ModelSearchSearch extends Model {
}
$query = $this->db->query("SELECT `id`, `from`, `subject`, `piler_id`, `reference`, `size`, `spam`, `sent`, `arrived`, `attachments` FROM `" . TABLE_META . "` WHERE `id` IN ($q) $sortorder", $ids);
$query = $this->db->query("SELECT `id`, `from`, `subject`, `piler_id`, `reference`, `retained`, `size`, `spam`, `sent`, `arrived`, `attachments` FROM `" . TABLE_META . "` WHERE `id` IN ($q) $sortorder", $ids);
if(isset($query->rows)) {
@ -556,7 +556,7 @@ class ModelSearchSearch extends Model {
$this->model_search_message->connect_to_pilergetd();
foreach($query->rows as $m) {
if($m['retained'] < NOW) continue;
if(ENABLE_DELETE == 1 && $m['retained'] < NOW) $m['deleted'] = 1; else $m['deleted'] = 0;
$m['shortfrom'] = make_short_string($m['from'], MAX_CGI_FROM_SUBJ_LEN);
$m['from'] = escape_gt_lt_quote_symbols($m['from']);