From b65d7e450e07751ac3b22a68fbf981448976db99 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Sun, 14 Jul 2019 19:43:22 +0000 Subject: [PATCH] 49_SSCam: contrib 8.16.0 git-svn-id: https://svn.fhem.de/fhem/trunk@19832 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/49_SSCam.pm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fhem/contrib/DS_Starter/49_SSCam.pm b/fhem/contrib/DS_Starter/49_SSCam.pm index a10df4905..ec428e9e7 100644 --- a/fhem/contrib/DS_Starter/49_SSCam.pm +++ b/fhem/contrib/DS_Starter/49_SSCam.pm @@ -7169,6 +7169,7 @@ sub SSCam_StreamDev($$$;$) { my $sid = $hash->{HELPER}{SID}; my $proto = $hash->{PROTOCOL}; $ftui = ($ftui && $ftui eq "ftui")?1:0; + my $hdrAlign = "center"; my ($cause,$ret,$link,$audiolink,$devWlink,$wlhash,$alias,$wlalias); # Kontext des SSCamSTRM-Devices speichern für SSCam_refresh @@ -7276,9 +7277,9 @@ sub SSCam_StreamDev($$$;$) { $ret .= ""; $ret .= ''; if($ftui) { - $ret .= "$dlink $show
" if(!AttrVal($strmdev,"hideDisplayNameFTUI",0)); + $ret .= "$dlink $show
" if(!AttrVal($strmdev,"hideDisplayNameFTUI",0)); } else { - $ret .= "$dlink $show
" if(!AttrVal($strmdev,"hideDisplayName",0)); + $ret .= "$dlink $show
" if(!AttrVal($strmdev,"hideDisplayName",0)); } $ret .= ''; $ret .= ''; @@ -7699,6 +7700,7 @@ sub SSCam_composegallery ($;$$$) { $limit = $totalcnt if ($limit > $totalcnt); # wenn weniger Snaps vorhanden sind als $limit -> Text in Anzeige korrigieren $ftui = ($ftui && $ftui eq "ftui")?1:0; my $uuid = ""; + my $hdrAlign = "center"; my $lupt = ((ReadingsTimestamp($name,"LastSnapTime"," ") gt ReadingsTimestamp($name,"LastUpdateTime"," ")) ? ReadingsTimestamp($name,"LastSnapTime"," ") : ReadingsTimestamp($name,"LastUpdateTime"," ")); # letzte Aktualisierung @@ -7729,7 +7731,6 @@ sub SSCam_composegallery ($;$$$) { my $dlink = "$alias"; # falls "SSCam_composegallery" durch ein SSCamSTRM-Device aufgerufen wird - my $devWlink = ""; my $pws = ""; if ($strmdev) { $pws = AttrVal($strmdev, "popupWindowSize", ""); # Größe eines Popups (umgelegt: Forum:https://forum.fhem.de/index.php/topic,45671.msg927912.html#msg927912) @@ -7756,11 +7757,11 @@ sub SSCam_composegallery ($;$$$) { } # Header Generierung - my $header; + my $header; if($ftui) { - $header .= "$dlink
" if(!AttrVal($strmdev,"hideDisplayNameFTUI",0)); + $header .= "$dlink
" if(!AttrVal($strmdev,"hideDisplayNameFTUI",0)); } else { - $header .= "$dlink
" if(!AttrVal($strmdev,"hideDisplayName",0)); + $header .= "$dlink
" if(!AttrVal($strmdev,"hideDisplayName",0)); } if ($lang eq "EN") { $header .= "Snapshots ($limit/$totalcnt) of camera $camname - newest Snapshot: $lss
"; @@ -7780,7 +7781,7 @@ sub SSCam_composegallery ($;$$$) { my ($htmlCode,$ct); $htmlCode = ""; $htmlCode .= ""; - $htmlCode .= sprintf("$devWlink
$header
"); + $htmlCode .= "
$header
"; $htmlCode .= '
'; $htmlCode .= ""; $htmlCode .= "";