global-functions: drop support for attachment in notification e-mail

This commit is contained in:
Christian Hesse 2021-02-16 16:04:18 +01:00
parent e7c2a7745a
commit 17d7678e2d
6 changed files with 12 additions and 15 deletions

View file

@ -773,7 +773,6 @@
:local Subject [ :tostr $1 ];
:local Message [ :tostr $2 ];
:local Link [ :tostr $3 ];
:local Attach [ :tostr $4 ];
:global Identity;
:global EmailGeneralTo;
@ -792,8 +791,7 @@
subject=("[" . $Identity . "] " . $Subject) \
body=($Message . \
[ $IfThenElse ([ :len $Link ] > 0) ("\n\n" . $Link) "" ] . \
[ $IfThenElse ([ :len $Signature ] > 0) ("\n-- \n" . $Signature) "" ]) \
file=$Attach;
[ $IfThenElse ([ :len $Signature ] > 0) ("\n-- \n" . $Signature) "" ]);
} on-error={
$LogPrintExit warning ("Failed sending notification mail!") false;
}
@ -805,13 +803,12 @@
:local Subject [ :tostr $1 ];
:local Message [ :tostr $2 ];
:local Link [ :tostr $3 ];
:local Attach [ :tostr $4 ];
:local Silent [ :tostr $5 ];
:local Silent [ :tostr $4 ];
:global SendEMail;
:global SendTelegram;
$SendEMail $Subject $Message $Link $Attach;
$SendEMail $Subject $Message $Link;
$SendTelegram $Subject $Message $Link $Silent;
}