Autocommit in repo: ros.vados.ru, generated by owner: root, in 16:25:03 04.05.2026.

diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc
index b342e8a6e7a0a12c346c7b9e24dc6fdecf9e6e5a..3c5347378b42cf6fefd9a5c9b94f0f1137e8ac35 100644 (file)
--- a/html/AM-FwAddrLists.rsc
+++ b/html/AM-FwAddrLists.rsc
@@ -123,16 +123,16 @@
 
     :foreach Line in=[ :deserialize $Data delimiter="\n" from=dsv options=dsv.plain ] do={
       :set Line ($Line->0);
-      :local Delim [ $FindDelim $Line ];
-      :if ($Delim = 0) do={ :set Line ""; };
-      :if ([ :len $Line ] = 0) do={ :error true; }
+#      :local Delim [ $FindDelim $Line ];
+#      :if ($Delim = 0) do={ :set Line ""; };
+#      :if ([ :len $Line ] = 0) do={ :error true; }
       :local Address;
       :if ([ :pick $Line 0 1 ] = "{" && [ :pick $Line ([ :len $Line ] - 1) ] = "}") do={
         :do {
           :set Address [ :tostr ([ :deserialize from=json $Line ]->"cidr") ];
         } on-error={ }
       } else={
-        :set Address [ :pick $Line 0 [ $FindDelim $Line ] ];
+          :set Address ([ :pick $Line 0 [ $FindDelim $Line ] ] . ($List->"cidr"));
       }
       :do {
         :local Branch;
@@ -146,7 +146,8 @@
             :set Address [ :tostr (([ :toip $Net ] & [ $NetMask4 $CIDR ]) . [ $IfThenElse ($CIDR < 32) ("/" . $CIDR) ]) ];
           }
           :set Branch [ $GetBranch $Address ];
-          :if ([ :typeof ($IPv4Addresses->$Branch) ] != "array") do={ :set ($IPv4Addresses->$Branch) ({}) };
+          :if ([ :typeof ($IPv4Addresses->$Branch) ] != "array") do={
+             :set ($IPv4Addresses->$Branch) ({}) };
           :set ($IPv4Addresses->$Branch->$Address) $TimeOut;
         }
         :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={
@@ -169,7 +170,9 @@
           :set ($IPv4Addresses->$Branch->$Address) $TimeOut;
           :set ($IPv6Addresses->$Branch->$Address) $TimeOut;
         }
-      } on-error={:log error ($ScriptName . " Failed parsing address: " . $Line->0);}
+      } 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 c557315cc70daffda49e901f57fdc8e91da642c2..e0387436ed5b3c3b0b2d26758921048c3f028ec1 100644 (file)
--- 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/573/30f940d0";
+:global CommitId "main/574/d485d70a";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 16:15:03 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 16:25:03 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 140;