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

step 1 to improve delete feature

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2019-07-14 19:20:49 +02:00
parent 7015e76a11
commit d1da0c93e7
23 changed files with 92 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,7 +484,8 @@ class ModelSearchSearch extends Model {
$rcpt = $srcpt = array();
$tag = array();
$note = array();
$private = array();
$private = [];
$deleted = [];
$q = '';
global $SUPPRESS_RECIPIENTS;
@ -516,12 +517,20 @@ class ModelSearchSearch extends Model {
if(isset($query->rows)) {
$privates = $this->db->query("SELECT `id` FROM `" . TABLE_PRIVATE . "` WHERE id IN ($q)", $ids);
$s = $this->db->query("SELECT `id` FROM `" . TABLE_PRIVATE . "` WHERE id IN ($q)", $ids);
foreach ($privates->rows as $p) {
foreach ($s->rows as $p) {
$private[$p['id']] = 1;
}
if(ENABLE_DELETE) {
$s = $this->db->query("SELECT `id` FROM `" . TABLE_DELETED . "` WHERE id IN ($q)", $ids);
foreach ($s->rows as $p) {
$deleted[$p['id']] = 1;
}
}
array_unshift($ids, (int)$session->get("uid"));
$tags = $this->db->query("SELECT `id`, `tag` FROM `" . TABLE_TAG . "` WHERE `uid`=? AND `id` IN ($q)", $ids);
@ -540,7 +549,8 @@ class ModelSearchSearch extends Model {
foreach($query->rows as $m) {
if(ENABLE_DELETE == 1 && $m['retained'] < NOW) $m['deleted'] = 1; else $m['deleted'] = 0;
// 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;
$m['shortfrom'] = make_short_string($m['from'], MAX_CGI_FROM_SUBJ_LEN);
$m['from'] = escape_gt_lt_quote_symbols($m['from']);