From: vados-dev <192440777+vados-dev@users.noreply.github.com>
Date: Mon, 4 May 2026 12:15:03 +0000 (+0300)
Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:15:03 04.05.2026.
X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=cea14eafd699b8c6325f12444eab8a59c418079b;p=Mikrotiks%2Fros.vados.ru.git

Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:15:03 04.05.2026.
---

diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc
index d6d9e1160..fbe6c00ed 100644
--- a/html/AM-FwAddrLists.rsc
+++ b/html/AM-FwAddrLists.rsc
@@ -76,22 +76,22 @@
     :set tmpIndex "";
   }
 
-  :foreach FwList in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={
-    :set FwList ($FwList->0);
-    :local FwListName;
+  :foreach FwListName in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={
+#    :set FwListName ($FwList->0);
+#    :local FwListName;
 #    :local FwListName ($FwListFile->0);
 #    :set FwListName [ $Grep $FwListName "[^0-9a-zA-Z\\./:-]" ];
-    :set FwListName ([ :pick $Line 0 [ $FindDelim $FwList ] ] ;
+#    :set FwListName ([ :pick $FwList 0 [ $FindDelim $FwList ] ]);
 #    :set FwListName [ $Grep $FwListName "[^0-9a-zA-Z\\./:-]" ];
-    :log warning ($ScriptName . " Parsing address-list index entry: " . $FwListName);
+#    :log warning ($ScriptName . " Parsing address-list index entry: " . $FwListName);
 
-    :local Delim [ $FindDelim $FwListName ];
-    :if ($Delim = 0) do={ :set FwListName ""; };
+#    :local Delim [ $FindDelim $FwListName ];
+#    :if ($Delim = 0) do={ :set FwListName ""; };
     :if ([ :len $FwListName ] = 0) do={
       :log error ($ScriptName . " Failed parsing address-list index entry: " . $FwListFile->0);
       :error true; 
       }
-    :set FwListName [ :pick $FwListName 0 $Delim ];
+#    :set FwListName [ :pick $FwListName 0 $Delim ];
 
     :local FwListUrl ($FwAddrListsUrl . $FwListName);
     :local CntAdd 0;
@@ -105,9 +105,9 @@
 
     :for I from=1 to=5 do={
       :if ($Data = false) do={
-        :set Data [ :tolf [ $FetchLargeFiles $ScriptName $FwListUrl true $FetchMode ] ];
+        :set Data [ :tolf [ $FetchLargeFiles $ScriptName $FwAddrListsUrl $FwListName $CheckCerts ] ];
         :if ($Data = false && $I < 5) do={
-          :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . "', " . $I . ". try from: " . $FwListUrl);
+          :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . "', " . $I . ". try from: " . $FwAddrListsUrl . $FwListName);
           :delay (($I * $I) . "s");
         }
       }
@@ -116,9 +116,9 @@
     :if ($Data = false) do={
       :set Data "";
       :set Failure true;
-      :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . "' from: " . $FwListUrl);
+      :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . "' from: " . $FwAddrListsUrl . $FwListName);
     } else={
-      :log debug ($ScriptName . " Downloaded " . [ $HumanReadableNum [ :len $Data ] 1024 ] . "B for list '" . $FwListName . "' from: " . $FwListUrl);
+      :log debug ($ScriptName . " Downloaded " . [ $HumanReadableNum [ :len $Data ] 1024 ] . "B for list '" . $FwListName . "' from: " . $FwAddrListsUrl . $FwListName);
     }
 
     :foreach Line in=[ :deserialize $Data delimiter="\n" from=dsv options=dsv.plain ] do={
diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 3fba0ce27..9339400d0 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/568/5c207d26";
+:global CommitId "main/569/b3bb0022";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:55:02 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:15:03 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 140;