From 58afe6d6321e0bb5e7fc756b9e0b4631ee524137 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 20 May 2026 08:59:25 +0200
Subject: [PATCH] daily-psk: use :convert for url-encoding

---
 daily-psk.capsman.rsc  | 3 +--
 daily-psk.local.rsc    | 3 +--
 daily-psk.template.rsc | 3 +--
 daily-psk.wifi.rsc     | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index 8d8a5ee7..2c52ada8 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -27,7 +27,6 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
-  :global UrlEncode;
   :global WaitForFile;
   :global WaitFullyConnected;
 
@@ -78,7 +77,7 @@
           $LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
         } else={
           :local Link ($DailyPskQrCodeUrl . \
-              "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
+              "?scale=8&level=1&ssid=" . [ :convert to=url $Ssid ] . "&pass=" . [ :convert to=url $NewPsk ]);
           $SendNotification2 ({ origin=$ScriptName; \
             subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
             message=("This is the daily PSK on " . $Identity . ":\n\n" . \
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index 62f4cf42..fd63f873 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -27,7 +27,6 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
-  :global UrlEncode;
   :global WaitForFile;
   :global WaitFullyConnected;
 
@@ -77,7 +76,7 @@
           $LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
         } else={
           :local Link ($DailyPskQrCodeUrl . \
-              "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
+              "?scale=8&level=1&ssid=" . [ :convert to=url $Ssid ] . "&pass=" . [ :convert to=url $NewPsk ]);
           $SendNotification2 ({ origin=$ScriptName; \
             subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
             message=("This is the daily PSK on " . $Identity . ":\n\n" . \
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 5e569053..92a7f139 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -28,7 +28,6 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
-  :global UrlEncode;
   :global WaitForFile;
   :global WaitFullyConnected;
 
@@ -93,7 +92,7 @@
           $LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
         } else={
           :local Link ($DailyPskQrCodeUrl . \
-              "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
+              "?scale=8&level=1&ssid=" . [ :convert to=url $Ssid ] . "&pass=" . [ :convert to=url $NewPsk ]);
           $SendNotification2 ({ origin=$ScriptName; \
             subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
             message=("This is the daily PSK on " . $Identity . ":\n\n" . \
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 66321173..2bcfd9fd 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -27,7 +27,6 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
-  :global UrlEncode;
   :global WaitForFile;
   :global WaitFullyConnected;
 
@@ -78,7 +77,7 @@
           $LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
         } else={
           :local Link ($DailyPskQrCodeUrl . \
-              "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
+              "?scale=8&level=1&ssid=" . [ :convert to=url $Ssid ] . "&pass=" . [ :convert to=url $NewPsk ]);
           $SendNotification2 ({ origin=$ScriptName; \
             subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
             message=("This is the daily PSK on " . $Identity . ":\n\n" . \