bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 08:00:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug in bulk restore

Browse Source
This commit is contained in:
SJ 2012-08-15 16:24:56 +02:00
parent 1744ff986d
commit 653b5e8c18
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,17 +36,6 @@ class ControllerMessageBulkrestore extends Controller {
$this->data['username'] = Registry::get('username'); $this->data['username'] = Registry::get('username');
$rcpt = array();
/* send the email to all the recipients of the original email if we are admin or auditor users */
if(Registry::get('admin_user') == 1 || Registry::get('auditor_user') == 1) {
$rcpt = $this->model_search_search->get_message_recipients($this->data['id']);
}
else {
array_push($rcpt, $_SESSION['email']);
}
$this->data['restored'] = 0; $this->data['restored'] = 0;
@ -55,6 +44,17 @@ class ControllerMessageBulkrestore extends Controller {
AUDIT(ACTION_RESTORE_MESSAGE, '', '', $id, ''); AUDIT(ACTION_RESTORE_MESSAGE, '', '', $id, '');
$rcpt = array();
/* send the email to all the recipients of the original email if we are admin or auditor users */
if(Registry::get('auditor_user') == 1) {
$rcpt = $this->model_search_search->get_message_recipients($id);
}
else {
array_push($rcpt, $_SESSION['email']);
}
$x = $this->model_mail_mail->send_smtp_email(SMARTHOST, SMARTHOST_PORT, SMTP_DOMAIN, SMTP_FROMADDR, $rcpt, $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($id) ); "Received: by piler" . EOL . PILER_HEADER_FIELD . $id . EOL . $this->model_search_message->get_raw_message($id) );