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

revised ms journal handling

Browse Source
This commit is contained in:
SJ
2013-01-27 21:43:42 +01:00
parent e5618dd39b
commit 80cee9f59c
11 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,11 @@ class ControllerMessageBulkrestore extends Controller {
if(count($rcpt) > 0) {
$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);
$x = $this->model_mail_mail->send_smtp_email(SMARTHOST, SMARTHOST_PORT, SMTP_DOMAIN, SMTP_FROMADDR, $rcpt,
"Received: by piler" . EOL . PILER_HEADER_FIELD . $id . EOL . $this->model_search_message->get_raw_message($piler_id) );
"Received: by piler" . EOL . PILER_HEADER_FIELD . $id . EOL . $msg );
if($x == 1) { $this->data['restored']++; }
}

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

@ -41,10 +41,9 @@ class ControllerMessageDownload extends Controller {
header("Content-Transfer-Encoding: binary\n");
print $this->model_search_message->get_raw_message($this->data['piler_id']);
exit;
$this->render();
$msg = $this->model_search_message->get_raw_message($this->data['piler_id']);
$this->model_search_message->remove_journal($msg);
print $msg;
}

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

@ -58,8 +58,11 @@ class ControllerMessageRestore extends Controller {
$this->data['piler_id'] = $this->model_search_message->get_piler_id_by_id($this->data['id']);
$msg = $this->model_search_message->get_raw_message($this->data['piler_id']);
$this->model_search_message->remove_journal($msg);
$x = $this->model_mail_mail->send_smtp_email(SMARTHOST, SMARTHOST_PORT, SMTP_DOMAIN, SMTP_FROMADDR, $rcpt,
"Received: by piler" . EOL . PILER_HEADER_FIELD . $this->data['id'] . EOL . $this->model_search_message->get_raw_message($this->data['piler_id']) );
"Received: by piler" . EOL . PILER_HEADER_FIELD . $this->data['id'] . EOL . $msg );
if($x == 1) { $this->data['data'] = $this->data['text_restored']; }
}