FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 13:24:56 +00:00
Code Issues Releases Wiki Activity

49_SSCam: contrib 8.4.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18195 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-01-09 18:54:08 +00:00
parent 533eeab247
commit c33149547f
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/contrib/DS_Starter/49_SSCam.pm
View File

@ -47,7 +47,7 @@ use Encode;
# Versions History intern # Versions History intern
our %SSCam_vNotesIntern = ( our %SSCam_vNotesIntern = (
"8.4.1" => "07.01.2019 Transaction of snap and getsnapinfo implemented, debugactive token verbose level changed ", "8.4.1" => "09.01.2019 Transaction of snap and getsnapinfo implemented, debugactive token verbose level changed ",
"8.4.0" => "07.01.2019 command snap extended to \"snap [number] [lag] [snapEmailTxt:\"subject => <Betreff-Text>, body => ". "8.4.0" => "07.01.2019 command snap extended to \"snap [number] [lag] [snapEmailTxt:\"subject => <Betreff-Text>, body => ".
"<Mitteilung-Text>\"]\", SID-hash is deleted if attr \"session\" is set ", "<Mitteilung-Text>\"]\", SID-hash is deleted if attr \"session\" is set ",
"8.3.2" => "03.01.2019 fix Process died prematurely if Can't locate object method \"get_sslversion\" via package \"Net::SMTP::SSL\" ", "8.3.2" => "03.01.2019 fix Process died prematurely if Can't locate object method \"get_sslversion\" via package \"Net::SMTP::SSL\" ",
@ -4932,16 +4932,14 @@ sub SSCam_camop_parse ($) {
my $emtxt = $hash->{HELPER}{SMTPMSG}?$hash->{HELPER}{SMTPMSG}:""; # alternativer Text für Email-Versand my $emtxt = $hash->{HELPER}{SMTPMSG}?$hash->{HELPER}{SMTPMSG}:""; # alternativer Text für Email-Versand
if($ncount > 0) { if($ncount > 0) {
InternalTimer(gettimeofday()+$lag, "SSCam_camsnap", "$name:$num:$lag:$ncount:$emtxt:$tac", 0); InternalTimer(gettimeofday()+$lag, "SSCam_camsnap", "$name:$num:$lag:$ncount:$emtxt:$tac", 0);
# Token freigeben für nächstes Kommando
# SSCam_delActiveToken($hash);
return; return;
} }
# Schnappschußgalerie abrufen (snapGalleryBoost) oder nur Info des letzten Snaps # Anzahl und Size für Schnappschußabruf bestimmen
my ($slim,$ssize) = SSCam_snaplimsize($hash); my ($slim,$ssize) = SSCam_snaplimsize($hash);
if(!$hash->{HELPER}{CANSENDSNAP}) { if(!$hash->{HELPER}{TRANSACTION}) {
# Token freigeben vor nächstem Kommando # Token freigeben vor nächstem Kommando wenn keine Transaktion läuft
SSCam_delActiveToken($hash); SSCam_delActiveToken($hash);
} }
@ -5068,7 +5066,8 @@ sub SSCam_camop_parse ($) {
} }
} }
} }
SSCam_closeTrans($hash); # Transaktion beenden
SSCam_closeTrans($hash); # Transaktion beenden
delete($hash->{HELPER}{GETSNAPGALLERY}); # Steuerbit getsnapgallery statt getsnapinfo delete($hash->{HELPER}{GETSNAPGALLERY}); # Steuerbit getsnapgallery statt getsnapinfo
##### Fall abhängige Eventgenerierung ##### ##### Fall abhängige Eventgenerierung #####
@ -7220,6 +7219,8 @@ sub SSCam_prepareSendEmail ($$;$) {
$smtpsslport = AttrVal($name,"smtpSSLPort",0); $smtpsslport = AttrVal($name,"smtpSSLPort",0);
} }
my $tac = $hash->{HELPER}{TRANSACTION}; # Code der laufenden Transaktion
if($OpMode =~ /^getsnap/) { if($OpMode =~ /^getsnap/) {
$fname = ReadingsVal($name,"LastSnapFilename",""); $fname = ReadingsVal($name,"LastSnapFilename","");
$snapid = ReadingsVal($name,"LastSnapId",""); $snapid = ReadingsVal($name,"LastSnapId","");
@ -7239,6 +7240,7 @@ sub SSCam_prepareSendEmail ($$;$) {
'smtpnousessl' => $nousessl, 'smtpnousessl' => $nousessl,
'sslfrominit' => $sslfrominit, 'sslfrominit' => $sslfrominit,
'smtpsslport' => $smtpsslport, 'smtpsslport' => $smtpsslport,
'tac' => $tac,
} }
); );
} }
@ -7323,6 +7325,7 @@ sub SSCam_sendEmail ($$) {
'opmode' => { 'default'=>'', 'required'=>1, 'set'=>1}, # OpMode muss gesetzt sein 'opmode' => { 'default'=>'', 'required'=>1, 'set'=>1}, # OpMode muss gesetzt sein
'sslfb' => { 'default'=>$sslfb, 'required'=>0, 'set'=>1}, # Flag für Verwendung altes Net::SMTP::SSL 'sslfb' => { 'default'=>$sslfb, 'required'=>0, 'set'=>1}, # Flag für Verwendung altes Net::SMTP::SSL
'sslfrominit' => { 'default'=>'', 'required'=>0, 'set'=>1}, # SSL soll sofort ! aufgebaut werden 'sslfrominit' => { 'default'=>'', 'required'=>0, 'set'=>1}, # SSL soll sofort ! aufgebaut werden
'tac' => { 'default'=>'', 'required'=>0, 'set'=>1}, # übermittelter Transaktionscode der ausgewerteten Transaktion
); );
my %params = (); my %params = ();
@ -7384,6 +7387,7 @@ sub SSCam_sendEmailblocking($) {
my $opmode = $paref->{opmode}; # aktueller Operation Mode my $opmode = $paref->{opmode}; # aktueller Operation Mode
my $sslfb = $paref->{sslfb}; # Flag für Verwendung altes Net::SMTP::SSL my $sslfb = $paref->{sslfb}; # Flag für Verwendung altes Net::SMTP::SSL
my $sslfrominit = $paref->{sslfrominit}; # SSL soll sofort ! aufgebaut werden my $sslfrominit = $paref->{sslfrominit}; # SSL soll sofort ! aufgebaut werden
my $tac = $paref->{tac}; # übermittelter Transaktionscode der ausgewerteten Transaktion
my $hash = $defs{$name}; my $hash = $defs{$name};
my $sslver = ""; my $sslver = "";
@ -7567,7 +7571,7 @@ sub SSCam_sendEmailblocking($) {
return "$name|$err|''"; return "$name|$err|''";
} }
my $ret = "Email successfully sent ".( $sslver?"encoded by $sslver":"" ); my $ret = "Email transaction \"$tac\" successfully sent ".( $sslver?"encoded by $sslver":"" );
Log3($name, 3, "$name - $ret To: $to".(($cc)?", CC: $cc":"") ); Log3($name, 3, "$name - $ret To: $to".(($cc)?", CC: $cc":"") );
if($sdat) { if($sdat) {