FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

49_SSCam: text field long for some attributes, the body text can contain HTML-Tags when sending snaps/recordings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26244 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2022-07-18 16:49:55 +00:00
parent 8cd3696be1
commit 6ac1543a04
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- feature: 49_SSCam: text field long for some attributes, the body text
can contain HTML-Tags when sending snaps/recordings
- bugfix: 57_SSCal: fix problem recurring MONTHLY appointment by day
- bugfix: 96_Snapcast: prevent crash in case of external group commands
- feature: 70_ESCVP21net: added undocumented settings (IMGPROC, IRIS, LIRIS)

24
fhem/FHEM/49_SSCam.pm
View File

@ -185,6 +185,8 @@ BEGIN {
# Versions History intern
my %vNotesIntern = (
"9.10.6" => "18.07.2022 textField-long property set for recChatTxt, recEmailTxt, recTelegramTxt, snapChatTxt, snapEmailTxt, snapTelegramTxt, ".
"set 'part1type' to default => text/html instead of text/plain",
"9.10.5" => "01.07.2022 fix noQuotesForSID using in streaming devices type mjpeg ",
"9.10.4" => "03.06.2022 avoid warning 'No data for Cache with key: {LASTSNAP}' if no snap exists ",
"9.10.3" => "23.11.2022 made SYNO.SurveillanceStation.AudioStream, SYNO.SurveillanceStation.VideoStream optional for SVS compatibility to 9.0.0 ",
@ -841,9 +843,9 @@ sub Initialize {
"loginRetries:1,2,3,4,5,6,7,8,9,10 ".
"pollcaminfoall ".
"ptzNoCapPrePat:1,0 ".
"recChatTxt ".
"recEmailTxt ".
"recTelegramTxt ".
"recChatTxt:textField-long ".
"recEmailTxt:textField-long ".
"recTelegramTxt:textField-long ".
"rectime ".
"recextend:1,0 ".
"smtpCc ".
@ -854,9 +856,9 @@ sub Initialize {
"smtpSSLPort ".
"smtpTo ".
"smtpNoUseSSL:1,0 ".
"snapChatTxt ".
"snapEmailTxt ".
"snapTelegramTxt ".
"snapChatTxt:textField-long ".
"snapEmailTxt:textField-long ".
"snapTelegramTxt:textField-long ".
"snapGalleryBoost:0,1 ".
"snapGallerySize:Icon,Full ".
"snapGalleryNumber:$defSnum ".
@ -10130,7 +10132,7 @@ sub _sendTelegram {
my %teleparams = (
'subject' => { 'default'=>'', 'required'=>0, 'set'=>1},
'part1type' => { 'default'=>'text/plain; charset=UTF-8', 'required'=>1, 'set'=>1},
'part1type' => { 'default'=>'text/html; charset=UTF-8', 'required'=>1, 'set'=>1},
'part1txt' => { 'default'=>'', 'required'=>0, 'set'=>1},
'part2type' => { 'default'=>'', 'required'=>0, 'set'=>1},
'sdat' => { 'default'=>'', 'required'=>0, 'set'=>1}, # Hashref der Bilddaten (Bilddaten base64 codiert), wenn gesetzt muss 'part2type' auf 'image/jpeg' gesetzt sein
@ -10656,9 +10658,9 @@ sub _prepSendMail {
$mt =~ s/['"]//gx;
my($subj,$body) = split(",", $mt, 2);
my $subjt = (split("=>", $subj))[1];
my $bodyt = (split("=>", $body))[1];
my($subj,$body) = split ",", $mt, 2;
my $subjt = (split "=>", $subj)[1];
my $bodyt = (split "=>", $body)[1];
$subjt = trim($subjt);
$subjt =~ s/\$CAM/$calias/gx;
@ -10739,7 +10741,7 @@ sub _sendEmail {
'smtpTo' => {'attr'=>'smtpTo', 'default'=>'', 'required'=>1, 'set'=>1},
'subject' => {'attr'=>'subject', 'default'=>'', 'required'=>1, 'set'=>1},
'smtpCc' => {'attr'=>'smtpCc', 'default'=>'', 'required'=>0, 'set'=>1},
'part1type' => { 'default'=>'text/plain; charset=UTF-8', 'required'=>1, 'set'=>1},
'part1type' => { 'default'=>'text/html; charset=UTF-8', 'required'=>1, 'set'=>1},
'part1txt' => { 'default'=>'', 'required'=>0, 'set'=>1},
'part2type' => { 'default'=>'', 'required'=>0, 'set'=>1},
'smtphost' => {'attr'=>'smtpHost', 'default'=>'', 'required'=>1, 'set'=>0},