gui: fixing journal handling

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2018-12-15 22:11:14 +00:00
parent 5f391ef9ef
commit 1b7026dce6
7 changed files with 44 additions and 56 deletions

View File

@ -84,7 +84,8 @@ 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::splitMessage($msg, $headers, $journal, $body);
$msg = $headers . $body;
if(RESTORE_OVER_IMAP == 1 && Registry::get('auditor_user') == 0) {
if($imap_ok) {

View File

@ -51,7 +51,9 @@ class ControllerMessageDownload extends Controller {
$msg = $this->model_search_message->get_raw_message($this->data['piler_id']);
$this->model_search_message->remove_journal($msg);
Piler_Mime_Decode::splitMessage($msg, $headers, $journal, $body);
$msg = $headers . $body;
print $msg;
}

View File

@ -14,7 +14,7 @@ class ControllerMessageJournal extends Controller {
$this->load->model('search/search');
$this->load->model('search/message');
$this->load->model('audit/audit');
$this->load->model('user/user');
$this->document->title = $this->data['text_message'];
@ -47,5 +47,3 @@ class ControllerMessageJournal extends Controller {
}
?>

View File

@ -72,7 +72,8 @@ 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::splitMessage($msg, $headers, $journal, $body);
$msg = $headers . $body;
if(RESTORE_OVER_IMAP == 1) {
if($this->model_mail_mail->connect_imap()) {