aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2023-04-21 00:05:46 +0200
committerGravatar Christian Hesse <mail@eworm.de>2023-04-24 22:26:26 +0200
commit944b2f58649835dbc6abe83bab6d4500dd046fd8 (patch)
treeca64ec35aba75ee87217ab3cce653ee732bbb026
parentb705ceae591205b5eba54ee2f6a1ffb9066f2779 (diff)
daily-psk: use $FormatLine
-rw-r--r--daily-psk.capsman.rsc7
-rw-r--r--daily-psk.local.rsc7
-rw-r--r--daily-psk.template.rsc7
3 files changed, 12 insertions, 9 deletions
diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index 17a09e1..e589991 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -17,6 +17,7 @@
:global DailyPskQrCodeUrl;
:global Identity;
+:global FormatLine;
:global LogPrintExit2;
:global SendNotification2;
:global SymbolForNotification;
@@ -86,9 +87,9 @@ $WaitFullyConnected;
$SendNotification2 ({ origin=$0; \
subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
message=("This is the daily PSK on " . $Identity . ":\n\n" . \
- "SSID: " . $Ssid . "\n" . \
- "PSK: " . $NewPsk . "\n" . \
- "Date: " . $Date . "\n\n" . \
+ [ $FormatLine "SSID" $Ssid ] . "\n" . \
+ [ $FormatLine "PSK" $NewPsk ] . "\n" . \
+ [ $FormatLine "Date" $Date ] . "\n\n" . \
"A client device specific rule must not exist!"); link=$Link });
}
}
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index 17a60f7..df17173 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -17,6 +17,7 @@
:global DailyPskQrCodeUrl;
:global Identity;
+:global FormatLine;
:global LogPrintExit2;
:global SendNotification2;
:global SymbolForNotification;
@@ -85,9 +86,9 @@ $WaitFullyConnected;
$SendNotification2 ({ origin=$0; \
subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
message=("This is the daily PSK on " . $Identity . ":\n\n" . \
- "SSID: " . $Ssid . "\n" . \
- "PSK: " . $NewPsk . "\n" . \
- "Date: " . $Date . "\n\n" . \
+ [ $FormatLine "SSID" $Ssid ] . "\n" . \
+ [ $FormatLine "PSK" $NewPsk ] . "\n" . \
+ [ $FormatLine "Date" $Date ] . "\n\n" . \
"A client device specific rule must not exist!"); link=$Link });
}
}
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 7e41a1f..5f30ce3 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -18,6 +18,7 @@
:global DailyPskQrCodeUrl;
:global Identity;
+:global FormatLine;
:global LogPrintExit2;
:global SendNotification2;
:global SymbolForNotification;
@@ -93,9 +94,9 @@ $WaitFullyConnected;
$SendNotification2 ({ origin=$0; \
subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
message=("This is the daily PSK on " . $Identity . ":\n\n" . \
- "SSID: " . $Ssid . "\n" . \
- "PSK: " . $NewPsk . "\n" . \
- "Date: " . $Date . "\n\n" . \
+ [ $FormatLine "SSID" $Ssid ] . "\n" . \
+ [ $FormatLine "PSK" $NewPsk ] . "\n" . \
+ [ $FormatLine "Date" $Date ] . "\n\n" . \
"A client device specific rule must not exist!"); link=$Link });
}
}