id list permission check fix

This commit is contained in:
SJ 2015-07-16 14:47:16 +02:00
parent 0b81ba067e
commit 2a5a391c76
3 changed files with 3 additions and 1 deletions

View File

@ -89,6 +89,7 @@ class ControllerMessageBulkrestore extends Controller {
if(RESTORE_OVER_IMAP == 1) {
if($imap_ok) {
$x = $this->imap->append(IMAP_RESTORE_FOLDER, $msg);
syslog(LOG_INFO, "imap append $id/$piler_id, rc=$x");
}
else { $x = 0; }
}

View File

@ -75,6 +75,7 @@ class ControllerMessageRestore extends Controller {
if(RESTORE_OVER_IMAP == 1) {
if($this->model_mail_mail->connect_imap()) {
$x = $this->imap->append(IMAP_RESTORE_FOLDER, $msg);
syslog(LOG_INFO, "imap append " . $this->data['id'] . "/" . $this->data['piler_id'] . ", rc=$x");
$this->model_mail_mail->disconnect_imap();
}
else {

View File

@ -820,7 +820,7 @@ class ModelSearchSearch extends Model {
if(ENABLE_FOLDER_RESTRICTIONS == 1) {
if(in_array($q['folder'], $session->get("folders"))) { array_push($result, $q['id']); }
}
else {
else if(!in_array($q['id'], $result)) {
array_push($result, $q['id']);
}
}