From 1b7f00548b6bd3690cf1ff6849d4e83d8adc7114 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Wed, 3 Feb 2016 09:14:55 +0000 Subject: [PATCH] 49_SSCAM: bugfix: credentials won't be deleted if "rereadcfg" is used git-svn-id: https://svn.fhem.de/fhem/trunk@10703 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/49_SSCam.pm | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 1d623e9cb..da99b2eb8 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - bugfix: 49_SSCAM: credentials won't be deleted if "rereadcfg" is used - bugfix: 76_MSGMail: Make use of attribute mailtype again (enabling html) - feature: 49_SSCAM: added function "svsinfo" to get informations about installed SVS-package diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index 6f4e5783f..822ba6fda 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -28,8 +28,8 @@ # Versions History: # # 1.10 02.02.2016 added function "svsinfo" to get informations about installed SVS-package, -# if Availability = "disconnected" then "state" will be "disconnected" too, -# Credentials were deleted if a device will be deleted +# if Availability = "disconnected" then "state"-value will be "disconnected" too, +# saved Credentials were deleted from file if a device will be deleted # 1.9.1 31.01.2016 a little bit code optimization # 1.9 28.01.2016 fixed the problem a recording may still stay active if fhem # will be restarted after a recording was triggered and @@ -83,9 +83,11 @@ sub SSCam_Initialize($) { my ($hash) = @_; $hash->{DefFn} = "SSCam_Define"; $hash->{UndefFn} = "SSCam_Undef"; + $hash->{DeleteFn} = "SSCam_Delete"; $hash->{SetFn} = "SSCam_Set"; $hash->{GetFn} = "SSCam_Get"; - $hash->{AttrFn} = "SSCam_Attr"; + $hash->{AttrFn} = "SSCam_Attr"; + $hash->{AttrList} = "httptimeout ". @@ -152,13 +154,19 @@ return undef; sub SSCam_Undef { my ($hash, $arg) = @_; + + RemoveInternalTimer($hash); + +return undef; +} + +sub SSCam_Delete { + my ($hash, $arg) = @_; my $index = $hash->{TYPE}."_".$hash->{NAME}."_credentials"; # gespeicherte Credentials löschen setKeyValue($index, undef); - RemoveInternalTimer($hash); - return undef; }