mirror of
https://github.com/eworm-de/routeros-scripts
synced 2024-05-14 08:04:19 +00:00
global-functions: add UrlEncode and use in SendNotification
This commit is contained in:
parent
2e64b97888
commit
cec61183eb
1 changed files with 25 additions and 1 deletions
|
@ -46,6 +46,28 @@
|
||||||
:return $return;
|
:return $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# url encoding
|
||||||
|
:global UrlEncode do={
|
||||||
|
:local return "";
|
||||||
|
|
||||||
|
:if ([ :len $1 ] > 0) do={
|
||||||
|
:local chars " %&";
|
||||||
|
:local subs { "%20"; "%25"; "%26" };
|
||||||
|
|
||||||
|
:for i from=0 to=([ :len $1 ] - 1) do={
|
||||||
|
:local char [ :pick $1 $i ];
|
||||||
|
:local replace [ :find $chars $char ];
|
||||||
|
|
||||||
|
:if ([ :len $replace ] > 0) do={
|
||||||
|
:set $char ($subs->$replace);
|
||||||
|
}
|
||||||
|
:set $return ($return . $char);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
:return $return;
|
||||||
|
}
|
||||||
|
|
||||||
# send notification via e-mail and telegram
|
# send notification via e-mail and telegram
|
||||||
# Note that subject and attachment are ignored for telegram!
|
# Note that subject and attachment are ignored for telegram!
|
||||||
:global SendNotification do={
|
:global SendNotification do={
|
||||||
|
@ -58,6 +80,8 @@
|
||||||
:global "telegram-tokenid";
|
:global "telegram-tokenid";
|
||||||
:global "telegram-chatid";
|
:global "telegram-chatid";
|
||||||
|
|
||||||
|
:global UrlEncode;
|
||||||
|
|
||||||
:if ([ :len $"email-general-to" ] > 0) do={
|
:if ([ :len $"email-general-to" ] > 0) do={
|
||||||
:do {
|
:do {
|
||||||
/ tool e-mail send to=$"email-general-to" cc=$"email-general-cc" \
|
/ tool e-mail send to=$"email-general-to" cc=$"email-general-cc" \
|
||||||
|
@ -74,7 +98,7 @@
|
||||||
do {
|
do {
|
||||||
/ tool fetch check-certificate=yes-without-crl keep-result=no http-method=post \
|
/ tool fetch check-certificate=yes-without-crl keep-result=no http-method=post \
|
||||||
("https://api.telegram.org/bot" . $"telegram-tokenid" . "/sendMessage") \
|
("https://api.telegram.org/bot" . $"telegram-tokenid" . "/sendMessage") \
|
||||||
http-data=("chat_id=" . $"telegram-chatid" . "&text=" . $message);
|
http-data=("chat_id=" . $"telegram-chatid" . "&text=" . [ $UrlEncode $message ]);
|
||||||
} on-error={
|
} on-error={
|
||||||
:log warning "Failed sending telegram notification!";
|
:log warning "Failed sending telegram notification!";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue