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

Revert "gui: fixing journal handling"

Browse Source 
This reverts commit 1b7026dce6.
This commit is contained in:
Janos SUTO
2018-12-23 19:50:14 +00:00
parent 1412a77fee
commit a5f005769f
7 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webui/controller/message/bulkrestore.php
View File

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

4
webui/controller/message/download.php
View File

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

4
webui/controller/message/journal.php
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,3 +47,5 @@ class ControllerMessageJournal extends Controller {
}
?>

3
webui/controller/message/restore.php
View File

@ -72,8 +72,7 @@ class ControllerMessageRestore extends Controller {
$msg = $this->model_search_message->get_raw_message($this->data['piler_id']);
Piler_Mime_Decode::splitMessage($msg, $headers, $journal, $body);
$msg = $headers . $body;
$this->model_search_message->remove_journal($msg);
if(RESTORE_OVER_IMAP == 1) {
if($this->model_mail_mail->connect_imap()) {