gui: Fix journal handling

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2018-12-23 20:00:22 +00:00
parent 0bf20b1f66
commit 8bd4531b04
5 changed files with 62 additions and 86 deletions

View File

@ -1,5 +1,6 @@
<?php
require DIR_SYSTEM . 'helper/mime.php';
class ControllerMessageBulkrestore extends Controller {
@ -84,7 +85,7 @@ class ControllerMessageBulkrestore extends Controller {
$piler_id = $this->model_search_message->get_piler_id_by_id($id);
$msg = $this->model_search_message->get_raw_message($piler_id);
$this->model_search_message->remove_journal($msg);
Piler_Mime_Decode::removeJournal($msg);
if(RESTORE_OVER_IMAP == 1 && Registry::get('auditor_user') == 0) {
if($imap_ok) {

View File

@ -1,5 +1,6 @@
<?php
require DIR_SYSTEM . 'helper/mime.php';
class ControllerMessageRestore extends Controller {
@ -72,7 +73,7 @@ class ControllerMessageRestore extends Controller {
$msg = $this->model_search_message->get_raw_message($this->data['piler_id']);
$this->model_search_message->remove_journal($msg);
Piler_Mime_Decode::removeJournal($msg);
if(RESTORE_OVER_IMAP == 1) {
if($this->model_mail_mail->connect_imap()) {