Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! add mail-from option

Browse source 
factor out duplicate code
This commit is contained in:
Richard Hansen 2024-12-19 19:31:53 -05:00 committed by Indrajit Raychaudhuri
parent 2de77f17f7
commit d1f81dc9e4
1 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ddclient.in
View file

@ -2407,28 +2407,16 @@ sub sendmail {
$recipients = opt('mail-failure'); $recipients = opt('mail-failure');
} }
if ($emailbody && $recipients && $emailbody ne $last_emailbody) { if ($emailbody && $recipients && $emailbody ne $last_emailbody) {
if ($sender) { pipecmd("sendmail -oi $recipients",
pipecmd("sendmail -oi $recipients", "To: $recipients",
"To: $recipients", $sender ne '' ? ("From: $sender") : (),
"From: $sender", "Subject: status report from $program\@$hostname",
"Subject: status report from $program\@$hostname", "\r\n",
"\r\n", $emailbody,
$emailbody, "",
"", "-- ", # https://en.wikipedia.org/wiki/Signature_block#Standard_delimiter
"-- ", # https://en.wikipedia.org/wiki/Signature_block#Standard_delimiter " $program\@$hostname (version $version)"
" $program\@$hostname (version $version)" );
);
} else {
pipecmd("sendmail -oi $recipients",
"To: $recipients",
"Subject: status report from $program\@$hostname",
"\r\n",
$emailbody,
"",
"-- ", # https://en.wikipedia.org/wiki/Signature_block#Standard_delimiter
" $program\@$hostname (version $version)"
);
}
} }
$last_emailbody = $emailbody; $last_emailbody = $emailbody;
$emailbody = ''; $emailbody = '';