mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-09 17:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-escape-question-mark' into next

Browse source
This commit is contained in:
Christian Hesse 2023-06-26 21:17:42 +02:00
commit 3bdaf6e45d
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
global-config.rsc
View file

@ -207,7 +207,7 @@
#:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/next/"; #:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/next/";
:global ScriptUpdatesUrlSuffix ""; :global ScriptUpdatesUrlSuffix "";
# use next branch with default url (git.eworm.de) # use next branch with default url (git.eworm.de)
#:global ScriptUpdatesUrlSuffix "\?h=next"; #:global ScriptUpdatesUrlSuffix "?h=next";
# Use this for defaults with $ScriptRunOnce # Use this for defaults with $ScriptRunOnce
# Install module with: # Install module with:

2
global-functions
View file

@ -166,7 +166,7 @@
/system/script/run global-config; /system/script/run global-config;
} on-error={ } on-error={
$LogPrintExit2 error $0 ("Reloading global configuration failed!" . \ $LogPrintExit2 error $0 ("Reloading global configuration failed!" . \
" Syntax error or missing overlay\?") false; " Syntax error or missing overlay?") false;
} }
} }

6
global-functions.rsc
View file

@ -321,7 +321,7 @@
} }
:local Return ""; :local Return "";
:local Chars ("^.[]\$()|*+\?{}\\"); :local Chars ("^.[]\$()|*+?{}\\");
:for I from=0 to=([ :len $Input ] - 1) do={ :for I from=0 to=([ :len $Input ] - 1) do={
:local Char [ :pick $Input $I ]; :local Char [ :pick $Input $I ];
@ -942,7 +942,7 @@
/system/script/run global-config; /system/script/run global-config;
} on-error={ } on-error={
$LogPrintExit2 error $0 ("Reloading global configuration failed!" . \ $LogPrintExit2 error $0 ("Reloading global configuration failed!" . \
" Syntax error or missing overlay\?") false; " Syntax error or missing overlay?") false;
} }
} }
@ -1251,7 +1251,7 @@
} }
:local Return ""; :local Return "";
:local Chars ("\n\r !\"#\$%&'()*+,:;<=>\?@[\\]^`{|}~"); :local Chars ("\n\r !\"#\$%&'()*+,:;<=>?@[\\]^`{|}~");
:local Subs { "%0A"; "%0D"; "%20"; "%21"; "%22"; "%23"; "%24"; "%25"; "%26"; "%27"; :local Subs { "%0A"; "%0D"; "%20"; "%21"; "%22"; "%23"; "%24"; "%25"; "%26"; "%27";
"%28"; "%29"; "%2A"; "%2B"; "%2C"; "%3A"; "%3B"; "%3C"; "%3D"; "%3E"; "%3F"; "%28"; "%29"; "%2A"; "%2B"; "%2C"; "%3A"; "%3B"; "%3C"; "%3D"; "%3E"; "%3F";
"%40"; "%5B"; "%5C"; "%5D"; "%5E"; "%60"; "%7B"; "%7C"; "%7D"; "%7E" }; "%40"; "%5B"; "%5C"; "%5D"; "%5E"; "%60"; "%7B"; "%7C"; "%7D"; "%7E" };

2
mod/notification-email.rsc
View file

@ -189,7 +189,7 @@
:return $Input; :return $Input;
} }
:return ("=\?utf-8\?Q\?" . $Return . "\?="); :return ("=?utf-8?Q?" . $Return . "?=");
} }
# send notification via e-mail - expects at least two string arguments # send notification via e-mail - expects at least two string arguments

2
mod/scriptrunonce.rsc
View file

@ -19,7 +19,7 @@
:global ValidateSyntax; :global ValidateSyntax;
:foreach Script in=$Scripts do={ :foreach Script in=$Scripts do={
:if (!($Script ~ "^(ftp|https\?|sftp)://")) do={ :if (!($Script ~ "^(ftp|https?|sftp)://")) do={
:if ([ :len $ScriptRunOnceBaseUrl ] = 0) do={ :if ([ :len $ScriptRunOnceBaseUrl ] = 0) do={
$LogPrintExit2 warning $0 ("Script '" . $Script . "' is not an url and base url is not available.") true; $LogPrintExit2 warning $0 ("Script '" . $Script . "' is not an url and base url is not available.") true;
} }

2
update-tunnelbroker.rsc
View file

@ -33,7 +33,7 @@ $ScriptLock $0;
:if ($Data = false) do={ :if ($Data = false) do={
:do { :do {
:set Data ([ /tool/fetch check-certificate=yes-without-crl \ :set Data ([ /tool/fetch check-certificate=yes-without-crl \
("https://ipv4.tunnelbroker.net/nic/update\?hostname=" . $Comment->"id") \ ("https://ipv4.tunnelbroker.net/nic/update?hostname=" . $Comment->"id") \
user=($Comment->"user") password=($Comment->"pass") output=user as-value ]->"data"); user=($Comment->"user") password=($Comment->"pass") output=user as-value ]->"data");
} on-error={ } on-error={
$LogPrintExit2 debug $0 ("Failed downloading, " . $I . " retries pending.") false; $LogPrintExit2 debug $0 ("Failed downloading, " . $I . " retries pending.") false;