Skip to content

Commit c6e05a8

Browse files
committed
Implemented: FS#1385 - Define all Email aliases in dovecot autoresponder
1 parent c84a6d5 commit c6e05a8

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

server/conf/sieve_filter.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ if header :contains "X-Spam-Flag" "YES" {
3131
}
3232
vacation :days 1
3333
:subject "Out of office reply"
34-
# :addresses ["test@test.int", "till@test.int"]
34+
<tmpl_var name='addresses'>
3535
"<tmpl_var name='autoresponder_text'>";
3636
</tmpl_if>

server/plugins-available/maildeliver_plugin.inc.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,21 @@ function update($event_name,$data) {
118118

119119
$data["new"]["autoresponder_text"] = str_replace("\"","'",$data["new"]["autoresponder_text"]);
120120
$tpl->setVar('autoresponder_text',$data["new"]["autoresponder_text"]);
121-
121+
122+
//* Set alias addresses for autoresponder
123+
$sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
124+
$records = $app->db->queryAllRecords($sql);
125+
$addresses = '';
126+
if(is_array($records)) {
127+
$addresses .= ':addresses [';
128+
foreach($records as $rec) {
129+
$addresses .= '"'.$rec['source'].'",';
130+
}
131+
$addresses = substr($addresses,0,-1);
132+
$addresses .= ']';
133+
}
134+
$tpl->setVar('addresses',$addresses);
135+
122136
file_put_contents($sieve_file,$tpl->grab());
123137

124138
unset($tpl);

0 commit comments

Comments
 (0)