From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 11:00:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:00:03 04.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=53a25a33bcc43c8eff8bcf5b2f9ea1c99dc9165a;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:00:03 04.05.2026. --- diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index aabbf7e79..3291c9ebf 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -33,10 +33,12 @@ :global NetMask6; :global ScriptLock; - :local FindDelim do={ + :local FindDelim; + :set FindDelim do={ + :local Length [ :tostr $1 ]; :local ValidChars "0123456789.:/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-"; - :for I from=0 to=([ :len $1 ] - 1) do={ - :if ([ :typeof [ :find $ValidChars [ :pick $1 $I ] ] ] != "num") do={ + :for I from=0 to=([ :len $Length ] - 1) do={ + :if ([ :typeof [ :find $ValidChars [ :pick $Length $I ] ] ] != "num") do={ :return $I; } } @@ -79,7 +81,10 @@ :local FwListName ($FwListFile->0); :local Delim [ $FindDelim $FwListName ]; :if ($Delim = 0) do={ :set FwListName ""; }; - :if ([ :len $FwListName ] = 0) do={ :error true; } + :if ([ :len $FwListName ] = 0) do={1 + :log error ($ScriptName . " Failed parsing address-list index entry: " . $FwListFile->0); + :error true; + } :set FwListName [ :pick $FwListName 0 $Delim ]; :local FwListUrl ($FwAddrListsUrl . $FwListName); diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index e33e6580a..42ab3df0d 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/561/62b8d2eb"; +:global CommitId "main/562/cda75821"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 13:45:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:00:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140;