From 354aedd98e308ca860796c2f8fdd53ea9eedbb17 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 27 Apr 2021 20:54:50 +0200 Subject: daily-psk: use $SendNotification2 --- daily-psk.capsman | 8 ++++---- daily-psk.local | 8 ++++---- daily-psk.template | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/daily-psk.capsman b/daily-psk.capsman index 7d2c2ae..eec3115 100644 --- a/daily-psk.capsman +++ b/daily-psk.capsman @@ -17,7 +17,7 @@ :global Identity; :global LogPrintExit2; -:global SendNotification; +:global SendNotification2; :global SymbolForNotification; :global UrlEncode; :global WaitForFile; @@ -81,12 +81,12 @@ $WaitFullyConnected; :set Seen ($Seen, $Ssid); :local Link ("https://www.eworm.de/cgi-bin/cqrlogo-wifi.cgi" . \ "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]); - $SendNotification ([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid) \ - ("This is the daily PSK on " . $Identity . ":\n\n" . \ + $SendNotification2 ({ 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" . \ - "A client device specific rule must not exist!") $Link; + "A client device specific rule must not exist!"); link=$Link }); } } } diff --git a/daily-psk.local b/daily-psk.local index 6186ddc..473238e 100644 --- a/daily-psk.local +++ b/daily-psk.local @@ -17,7 +17,7 @@ :global Identity; :global LogPrintExit2; -:global SendNotification; +:global SendNotification2; :global SymbolForNotification; :global UrlEncode; :global WaitForFile; @@ -81,12 +81,12 @@ $WaitFullyConnected; :set Seen ($Seen, $Ssid); :local Link ("https://www.eworm.de/cgi-bin/cqrlogo-wifi.cgi" . \ "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]); - $SendNotification ([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid) \ - ("This is the daily PSK on " . $Identity . ":\n\n" . \ + $SendNotification2 ({ 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" . \ - "A client device specific rule must not exist!") $Link; + "A client device specific rule must not exist!"); link=$Link }); } } } diff --git a/daily-psk.template b/daily-psk.template index 42abba5..cfb7ae7 100644 --- a/daily-psk.template +++ b/daily-psk.template @@ -18,7 +18,7 @@ :global Identity; :global LogPrintExit2; -:global SendNotification; +:global SendNotification2; :global SymbolForNotification; :global UrlEncode; :global WaitForFile; @@ -87,12 +87,12 @@ $WaitFullyConnected; :set Seen ($Seen, $Ssid); :local Link ("https://www.eworm.de/cgi-bin/cqrlogo-wifi.cgi" . \ "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]); - $SendNotification ([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid) \ - ("This is the daily PSK on " . $Identity . ":\n\n" . \ + $SendNotification2 ({ 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" . \ - "A client device specific rule must not exist!") $Link; + "A client device specific rule must not exist!"); link=$Link }); } } } -- cgit v1.2.3-54-g00ecf