From 0e83d2e317288442de06e6aea16aaaf0f7654f08 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 16 Oct 2023 21:15:05 +0200
Subject: daily-psk: use named array

---
 daily-psk.capsman.rsc   | 13 ++++---------
 daily-psk.local.rsc     | 13 ++++---------
 daily-psk.template.rsc  | 13 ++++---------
 daily-psk.wifiwave2.rsc | 13 ++++---------
 4 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index 0b5e666..b228d86 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -66,15 +66,9 @@ $WaitFullyConnected;
     /caps-man/access-list/set $AccList private-passphrase=$NewPsk;
 
     :if ([ :len [ /caps-man/actual-interface-configuration/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={
-      :foreach SeenSsid in=$Seen do={
-        :if ($SeenSsid = $Ssid) do={
-          $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
-          :set Skip 1;
-        }
-      }
-
-      :if ($Skip = 0) do={
-        :set Seen ($Seen, $Ssid);
+      :if ($Seen->$Ssid = 1) do={
+        $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
+      } else={
         :local Link ($DailyPskQrCodeUrl . \
             "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
         $SendNotification2 ({ origin=$0; \
@@ -84,6 +78,7 @@ $WaitFullyConnected;
             [ $FormatLine "PSK" $NewPsk ] . "\n" . \
             [ $FormatLine "Date" $Date ] . "\n\n" . \
             "A client device specific rule must not exist!"); link=$Link });
+        :set ($Seen->$Ssid) 1;
       }
     }
   }
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index df6d962..523e026 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -65,15 +65,9 @@ $WaitFullyConnected;
     /interface/wireless/access-list/set $AccList private-pre-shared-key=$NewPsk;
 
     :if ([ :len [ /interface/wireless/find where name=$IntName !disabled ] ] = 1) do={
-      :foreach SeenSsid in=$Seen do={
-        :if ($SeenSsid = $Ssid) do={
-          $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
-          :set Skip 1;
-        }
-      }
-
-      :if ($Skip = 0) do={
-        :set Seen ($Seen, $Ssid);
+      :if ($Seen->$Ssid = 1) do={
+        $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
+      } else={
         :local Link ($DailyPskQrCodeUrl . \
             "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
         $SendNotification2 ({ origin=$0; \
@@ -83,6 +77,7 @@ $WaitFullyConnected;
             [ $FormatLine "PSK" $NewPsk ] . "\n" . \
             [ $FormatLine "Date" $Date ] . "\n\n" . \
             "A client device specific rule must not exist!"); link=$Link });
+        :set ($Seen->$Ssid) 1;
       }
     }
   }
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 125e6c5..ad9198a 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -81,15 +81,9 @@ $WaitFullyConnected;
     :if ([ :len [ /caps-man/actual-interface-configuration/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={
     :if ([ :len [ /interface/wifiwave2/actual-configuration/find where configuration.ssid=$Ssid ] ] > 0) do={
     :if ([ :len [ /interface/wireless/find where name=$IntName !disabled ] ] = 1) do={
-      :foreach SeenSsid in=$Seen do={
-        :if ($SeenSsid = $Ssid) do={
-          $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
-          :set Skip 1;
-        }
-      }
-
-      :if ($Skip = 0) do={
-        :set Seen ($Seen, $Ssid);
+      :if ($Seen->$Ssid = 1) do={
+        $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
+      } else={
         :local Link ($DailyPskQrCodeUrl . \
             "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
         $SendNotification2 ({ origin=$0; \
@@ -99,6 +93,7 @@ $WaitFullyConnected;
             [ $FormatLine "PSK" $NewPsk ] . "\n" . \
             [ $FormatLine "Date" $Date ] . "\n\n" . \
             "A client device specific rule must not exist!"); link=$Link });
+        :set ($Seen->$Ssid) 1;
       }
     }
   }
diff --git a/daily-psk.wifiwave2.rsc b/daily-psk.wifiwave2.rsc
index 40c79cd..1be000d 100644
--- a/daily-psk.wifiwave2.rsc
+++ b/daily-psk.wifiwave2.rsc
@@ -66,15 +66,9 @@ $WaitFullyConnected;
     /interface/wifiwave2/access-list/set $AccList passphrase=$NewPsk;
 
     :if ([ :len [ /interface/wifiwave2/actual-configuration/find where configuration.ssid=$Ssid ] ] > 0) do={
-      :foreach SeenSsid in=$Seen do={
-        :if ($SeenSsid = $Ssid) do={
-          $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
-          :set Skip 1;
-        }
-      }
-
-      :if ($Skip = 0) do={
-        :set Seen ($Seen, $Ssid);
+      :if ($Seen->$Ssid = 1) do={
+        $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
+      } else={
         :local Link ($DailyPskQrCodeUrl . \
             "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
         $SendNotification2 ({ origin=$0; \
@@ -84,6 +78,7 @@ $WaitFullyConnected;
             [ $FormatLine "PSK" $NewPsk ] . "\n" . \
             [ $FormatLine "Date" $Date ] . "\n\n" . \
             "A client device specific rule must not exist!"); link=$Link });
+        :set ($Seen->$Ssid) 1;
       }
     }
   }
-- 
cgit v1.2.3-70-g09d2