7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added 'do nothing' option as default for sub-addressing

Browse Source
This commit is contained in:
Tii
2018-01-16 12:47:59 +01:00
parent e4b91e06a3
commit cd2c242540
11 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
data/web/inc/functions.mailbox.inc.php
View File

@@ -1287,6 +1287,18 @@ function mailbox($_action, $_type, $_data = null, $attr = null) {
return false;
}
}
else if (isset($_data['tagged_mail_handler']) && $_data['tagged_mail_handler'] == "subfolder") {
try {
$redis->hSet('RCPT_WANTS_SUBJECT_TAG', $username, 2);
}
catch (RedisException $e) {
$_SESSION['return'] = array(
'type' => 'danger',
'msg' => 'Redis: '.$e
);
return false;
}
}
else {
try {
$redis->hDel('RCPT_WANTS_SUBJECT_TAG', $username);
@@ -2599,12 +2611,16 @@ function mailbox($_action, $_type, $_data = null, $attr = null) {
$_data = $_SESSION['mailcow_cc_username'];
}
try {
if ($redis->hGet('RCPT_WANTS_SUBJECT_TAG', $_data)) {
$wants_subject_tag = $redis->hGet('RCPT_WANTS_SUBJECT_TAG', $_data);
if ($wants_subject_tag == 1) {
return "subject";
}
else {
elseif ($wants_subject_tag == 2) {
return "subfolder";
}
else {
return "none";
}
}
catch (RedisException $e) {
$_SESSION['return'] = array(
@@ -3685,4 +3701,4 @@ function mailbox($_action, $_type, $_data = null, $attr = null) {
}
break;
}
}
}