Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

49_SSCam: fix perl warnings, Forum: 45671.msg927912.html#msg927912

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@19145 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-04-07 19:46:23 +00:00
parent 4c4dc24f9d
commit 1cac54d3e4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 49_SSCam: fix perl warnings, Forum: 45671.msg927912.html#msg927912
- new: 10_WS980: new module to control the WS980Wifi weather station - new: 10_WS980: new module to control the WS980Wifi weather station
- feature: 93_DbRep: the "explain" SQL-command is possible now in sqlCmd - feature: 93_DbRep: the "explain" SQL-command is possible now in sqlCmd
- feature: 10_MYSENSORS_DEVICE: add attrTemplate support - feature: 10_MYSENSORS_DEVICE: add attrTemplate support

11
FHEM/49_SSCam.pm
View File

@ -48,6 +48,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
# Versions History intern # Versions History intern
our %SSCam_vNotesIntern = ( our %SSCam_vNotesIntern = (
"8.13.2" => "07.04.2019 fix perl warning Forum: https://forum.fhem.de/index.php/topic,45671.msg927912.html#msg927912",
"8.13.1" => "06.04.2019 verbose level in X_DelayedShutdown changed ", "8.13.1" => "06.04.2019 verbose level in X_DelayedShutdown changed ",
"8.13.0" => "27.03.2019 add Meta.pm support ", "8.13.0" => "27.03.2019 add Meta.pm support ",
"8.12.0" => "25.03.2019 FHEM standard function X_DelayedShutdown implemented, delay FHEM shutdown as long as sessions ". "8.12.0" => "25.03.2019 FHEM standard function X_DelayedShutdown implemented, delay FHEM shutdown as long as sessions ".
@ -1975,13 +1976,14 @@ return;
sub SSCam_myVersion($) { sub SSCam_myVersion($) {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $actvs = ""; my $actvs = 0;
my @vl = split (/-/,ReadingsVal($name, "SVSversion", ""),2); my @vl = split (/-/,ReadingsVal($name, "SVSversion", ""),2);
if(@vl) { if(@vl) {
$actvs = $vl[0]; $actvs = $vl[0];
$actvs =~ s/\.//g; $actvs =~ s/\.//g;
} }
return $actvs; return $actvs;
} }
@ -6836,7 +6838,7 @@ sub SSCam_ptzpanel($;$$) {
# return "" if($actvs <= 71); # return "" if($actvs <= 71);
#} #}
return if(SSCam_myVersion($hash) <= 71); return "" if(SSCam_myVersion($hash) <= 71);
$ptz_ret = "<div class=\"ptzpanel\">"; $ptz_ret = "<div class=\"ptzpanel\">";
$ptz_ret.= '<table class="rc_body">'; $ptz_ret.= '<table class="rc_body">';
@ -7521,12 +7523,13 @@ sub SSCam_composegallery ($;$$) {
my $imgdosnap = "<img src=\"$FW_ME/www/images/sscam/black_btn_DOSNAP.png\">"; my $imgdosnap = "<img src=\"$FW_ME/www/images/sscam/black_btn_DOSNAP.png\">";
my $ha = AttrVal($name, "snapGalleryHtmlAttr", AttrVal($name, "htmlattr", 'width="500" height="325"')); my $ha = AttrVal($name, "snapGalleryHtmlAttr", AttrVal($name, "htmlattr", 'width="500" height="325"'));
my $pws = AttrVal($strmdev, "popupWindowSize", ""); # Größe eines Popups
$pws =~ s/"//g if($pws);
# falls "SSCam_composegallery" durch ein SSCamSTRM-Device aufgerufen wird # falls "SSCam_composegallery" durch ein SSCamSTRM-Device aufgerufen wird
my $devWlink = ""; my $devWlink = "";
my $pws = "";
if ($strmdev) { if ($strmdev) {
$pws = AttrVal($strmdev, "popupWindowSize", ""); # Größe eines Popups (umgelegt: Forum:https://forum.fhem.de/index.php/topic,45671.msg927912.html#msg927912)
$pws =~ s/"//g if($pws);
my $wlha = AttrVal($strmdev, "htmlattr", undef); my $wlha = AttrVal($strmdev, "htmlattr", undef);
$ha = (defined($wlha))?$wlha:$ha; # htmlattr vom SSCamSTRM-Device übernehmen falls von SSCamSTRM-Device aufgerufen und gesetzt $ha = (defined($wlha))?$wlha:$ha; # htmlattr vom SSCamSTRM-Device übernehmen falls von SSCamSTRM-Device aufgerufen und gesetzt
} }