Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[Web] Allow to set bcc for quarantine messages

Browse Source
This commit is contained in:
andryyy 2020-01-10 20:43:40 +01:00
parent 2f818b7f84
commit 12b014082d
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/web/inc/functions.quarantine.inc.php
View File

@ -298,6 +298,12 @@ function quarantine($_action, $_data = null) {
$max_size = $_data['max_size']; $max_size = $_data['max_size'];
$max_age = intval($_data['max_age']); $max_age = intval($_data['max_age']);
$subject = $_data['subject']; $subject = $_data['subject'];
if (!filter_var($_data['global_rcpt'], FILTER_VALIDATE_EMAIL)) {
$global_rcpt = '';
}
else {
$global_rcpt = $_data['global_rcpt'];
}
if (!filter_var($_data['sender'], FILTER_VALIDATE_EMAIL)) { if (!filter_var($_data['sender'], FILTER_VALIDATE_EMAIL)) {
$sender = ''; $sender = '';
} }
@ -316,6 +322,7 @@ function quarantine($_action, $_data = null) {
$redis->Set('Q_EXCLUDE_DOMAINS', json_encode($exclude_domains)); $redis->Set('Q_EXCLUDE_DOMAINS', json_encode($exclude_domains));
$redis->Set('Q_RELEASE_FORMAT', $release_format); $redis->Set('Q_RELEASE_FORMAT', $release_format);
$redis->Set('Q_SENDER', $sender); $redis->Set('Q_SENDER', $sender);
$redis->Set('Q_GLOBAL_RCPT', $global_rcpt);
$redis->Set('Q_SUBJ', $subject); $redis->Set('Q_SUBJ', $subject);
$redis->Set('Q_HTML', $html); $redis->Set('Q_HTML', $html);
} }
@ -684,6 +691,7 @@ function quarantine($_action, $_data = null) {
$settings['release_format'] = $redis->Get('Q_RELEASE_FORMAT'); $settings['release_format'] = $redis->Get('Q_RELEASE_FORMAT');
$settings['subject'] = $redis->Get('Q_SUBJ'); $settings['subject'] = $redis->Get('Q_SUBJ');
$settings['sender'] = $redis->Get('Q_SENDER'); $settings['sender'] = $redis->Get('Q_SENDER');
$settings['global_rcpt'] = $redis->Get('Q_GLOBAL_RCPT');
$settings['html_tmpl'] = htmlspecialchars($redis->Get('Q_HTML')); $settings['html_tmpl'] = htmlspecialchars($redis->Get('Q_HTML'));
if (empty($settings['html_tmpl'])) { if (empty($settings['html_tmpl'])) {
$settings['html_tmpl'] = htmlspecialchars(file_get_contents("/tpls/quarantine.tpl")); $settings['html_tmpl'] = htmlspecialchars(file_get_contents("/tpls/quarantine.tpl"));