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

Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:55:02 04.05.2026.
---

diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc
index 6179b56b6..d6d9e1160 100644
--- a/html/AM-FwAddrLists.rsc
+++ b/html/AM-FwAddrLists.rsc
@@ -29,17 +29,15 @@
   :global IfThenElse;
   :global LogPrint;
   :global Grep;
-  :local ValidChars "0123456789.:/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-";
-  
+    
   :global NetMask4;
   :global NetMask6;
   :global ScriptLock;
   
-  :local FindDelim;
-  :set FindDelim do={
-    :local Length [ :tostr $1 ];
-    :for I from=0 to=([ :len $Length ] - 1) do={
-      :if ([ :typeof [ :find $ValidChars [ :pick $Length $I ] ] ] != "num") do={
+  :local FindDelim do={
+    :local ValidChars "0123456789.:/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-";
+    :for I from=0 to=[ :len $1 ] do={
+      :if ([ :typeof [ :find $ValidChars [ :pick ($1 . " ") $I ] ] ] != "num") do={
         :return $I;
       }
     }
@@ -82,6 +80,8 @@
     :set FwList ($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 [ $Grep $FwListName "[^0-9a-zA-Z\\./:-]" ];
     :log warning ($ScriptName . " Parsing address-list index entry: " . $FwListName);
 
diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 12a376132..3fba0ce27 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/567/f0428e42";
+:global CommitId "main/568/5c207d26";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:35:02 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:55:02 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 140;