From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Sun, 3 May 2026 18:35:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:35:02 03.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=d94b0594f8772f62e3d25f7a4519288a535c8614;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:35:02 03.05.2026. --- diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 8fe59c63f..30dc69fae 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -75,10 +75,10 @@ :local FwListName ($FwListFile->0); :local Delim [ $FindDelim $FwListName ]; :if ($Delim = 0) do={ :set FwListName ""; }; - :if ([ :len $FwListName ] = 0) do={ :error true; } - :set FwListName [ :pick $FwListName 0 $Delim ]; + :if ([ :len $FwListName ] > 0) do={ :set FwListName [ :pick $FwListName 0 $Delim ]; } :local FwListUrl ($FwAddrListsUrl . $FwListName); + :if ([ :len $FwListName ] > 0) do={ :local CntAdd 0; :local CntRenew 0; :local CntRemove 0; @@ -110,7 +110,8 @@ :set Line ($Line->0); :local Delim [ $FindDelim $Line ]; :if ($Delim = 0) do={ :set Line ""; }; - :if ([ :len $Line ] = 0) do={ :error true; } + :if ([ :len $Line ] = 0) do={ :set Line "#"; } + :if ([ :pick $Line 0 1 ] != "#") do={ :local Address; :if ([ :pick $Line 0 1 ] = "{" && [ :pick $Line ([ :len $Line ] - 1) ] = "}") do={ :do { @@ -158,6 +159,7 @@ :error true; } } on-error={:log error ($ScriptName . " Failed parsing address: " . $Line->0);} + } } :foreach Entry in=[ /ip/firewall/address-list/find where \ diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 249569546..b0b78b3a3 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/457/33b23c0a"; +:global CommitId "main/458/fca48ee9"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:25:03 03.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:35:02 03.05.2026."; # The variables are received right here. :global GlobalConfVersion 138;