mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-20 03:36:20 +02:00
vacation.pl - use \$friendly_from - see https://github.com/postfixadmin/postfixadmin/issues/543
This commit is contained in:
parent
79c9206338
commit
031de3a773
@ -496,10 +496,16 @@ sub send_vacation_email {
|
|||||||
|
|
||||||
$subject = Encode::encode_utf8($subject) if(Encode::is_utf8($subject));
|
$subject = Encode::encode_utf8($subject) if(Encode::is_utf8($subject));
|
||||||
$body = Encode::encode_utf8($body) if(Encode::is_utf8($body));
|
$body = Encode::encode_utf8($body) if(Encode::is_utf8($body));
|
||||||
|
|
||||||
|
$email_from = $from;
|
||||||
|
if($friendly_from ne '') {
|
||||||
|
$email_from = encode_mimewords($friendly_from, 'Charset', 'UTF-8') . " $from <$from>";
|
||||||
|
}
|
||||||
|
|
||||||
$email = Email::Simple->create(
|
$email = Email::Simple->create(
|
||||||
header => [
|
header => [
|
||||||
To => $to,
|
To => $to,
|
||||||
From => $from,
|
From => $email_from,
|
||||||
Subject => encode_mimewords($subject, 'Charset', 'UTF-8'),
|
Subject => encode_mimewords($subject, 'Charset', 'UTF-8'),
|
||||||
Precedence => 'junk',
|
Precedence => 'junk',
|
||||||
'Content-Type' => "text/plain; charset=utf-8",
|
'Content-Type' => "text/plain; charset=utf-8",
|
||||||
|
Loading…
Reference in New Issue
Block a user