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

Added a red "R" sign to the messages been marked for removal

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2021-04-26 06:10:08 +02:00
parent 22076d261c
commit 391005247c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,6 +473,7 @@ class ModelSearchSearch extends Model {
$note = array();
$private = [];
$deleted = [];
$marked_for_removal = [];
$q = '';
global $SUPPRESS_RECIPIENTS;
@ -509,10 +510,13 @@ class ModelSearchSearch extends Model {
}
if(ENABLE_DELETE) {
$s = $this->db->query("SELECT `id` FROM `" . TABLE_DELETED . "` WHERE deleted=1 AND id IN ($q)", $ids);
$s = $this->db->query("SELECT `id`, `deleted` FROM `" . TABLE_DELETED . "` WHERE id IN ($q)", $ids);
foreach ($s->rows as $p) {
$deleted[$p['id']] = 1;
if($p['id'] == 1) {
$deleted[$p['id']] = 1;
} else {
$marked_for_removal[$p['id']] = 1;
}
}
}
@ -536,6 +540,7 @@ class ModelSearchSearch extends Model {
foreach($query->rows as $m) {
// We mark it as deleted even if it's only marked for removal
if(ENABLE_DELETE == 1 && ($m['retained'] < NOW || isset($deleted[$m['id']])) ) $m['deleted'] = 1; else $m['deleted'] = 0;
if(ENABLE_DELETE == 1 && isset($marked_for_removal[$m['id']])) $m['marked_for_removal'] = 1; else $m['marked_for_removal'] = 0;
$m['shortfrom'] = make_short_string($m['from'], MAX_CGI_FROM_SUBJ_LEN);
$m['from'] = escape_gt_lt_quote_symbols($m['from']);