diff --git a/webui/controller/message/bulkrestore.php b/webui/controller/message/bulkrestore.php index 8f6c31f4..589c6733 100644 --- a/webui/controller/message/bulkrestore.php +++ b/webui/controller/message/bulkrestore.php @@ -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; } } diff --git a/webui/controller/message/restore.php b/webui/controller/message/restore.php index 4d1e985d..eb110c2c 100644 --- a/webui/controller/message/restore.php +++ b/webui/controller/message/restore.php @@ -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 { diff --git a/webui/model/search/search.php b/webui/model/search/search.php index 1335ff70..f14f657b 100644 --- a/webui/model/search/search.php +++ b/webui/model/search/search.php @@ -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']); } }