global-functions: split off $SendEMail and $SendTelegram

This commit is contained in:
Christian Hesse 2019-08-18 18:28:43 +02:00
parent 4210a49098
commit d457421e1e

View file

@ -89,21 +89,15 @@
} }
} }
# send notification via e-mail and telegram # send notification via e-mail
# Note that attachment is ignored for telegram! :global SendEMail do={
:global SendNotification do={
:local Subject [ :tostr $1 ]; :local Subject [ :tostr $1 ];
:local Message [ :tostr $2 ]; :local Message [ :tostr $2 ];
:local Attach [ :tostr $3 ]; :local Attach [ :tostr $3 ];
:global Identity; :global Identity;
:global EmailGeneralTo; :global EmailGeneralTo;
:global EmailGeneralCc; :global EmailGeneralCc;
:global TelegramTokenId;
:global TelegramChatId;
:global UrlEncode;
:global CertificateAvailable;
:if ([ :len $EmailGeneralTo ] > 0) do={ :if ([ :len $EmailGeneralTo ] > 0) do={
:do { :do {
@ -118,6 +112,19 @@
:log warning "Failed sending notification mail!"; :log warning "Failed sending notification mail!";
} }
} }
}
# send notification via telegram
:global SendTelegram do={
:local Subject [ :tostr $1 ];
:local Message [ :tostr $2 ];
:global Identity;
:global TelegramTokenId;
:global TelegramChatId;
:global UrlEncode;
:global CertificateAvailable;
:if ([ :len $TelegramTokenId ] > 0 && [ :len $TelegramChatId ] > 0) do={ :if ([ :len $TelegramTokenId ] > 0 && [ :len $TelegramChatId ] > 0) do={
$CertificateAvailable "Go Daddy Secure Certificate Authority - G2"; $CertificateAvailable "Go Daddy Secure Certificate Authority - G2";
@ -132,6 +139,21 @@
} }
} }
# send notification via e-mail and telegram
# Note that attachment is ignored for telegram!
:global SendNotification do={
:local Subject [ :tostr $1 ];
:local Message [ :tostr $2 ];
:local Attach [ :tostr $3 ];
:global SendEMail;
:global SendTelegram;
$SendEMail $Subject $Message $Attach;
$SendTelegram $Subject $Message;
}
# get MAC vendor # get MAC vendor
:global GetMacVendor do={ :global GetMacVendor do={
:local Mac [ :tostr $1 ]; :local Mac [ :tostr $1 ];