From d662589de6e4f9a5b2abd0d90ca38bbaa187f354 Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Wed, 25 Apr 2018 06:27:02 +0000 Subject: [PATCH] 73_GardenaSmartBridge: fix delete password then rereadcfg git-svn-id: https://svn.fhem.de/fhem/trunk@16659 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_GardenaSmartBridge.pm | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 9b9b1d383..9361b5ee4 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: 73_GardenaSmartBridge: fix delete password then rereadcfg - bugfix: 93_DbRep: 7.17.2, doesn't writeToDB if device name contain "." - feature: 93_DbLog: addLog - not available reading can be added as new one (forum:#86966) diff --git a/fhem/FHEM/73_GardenaSmartBridge.pm b/fhem/FHEM/73_GardenaSmartBridge.pm index 30eab548f..d3f6d2b64 100644 --- a/fhem/FHEM/73_GardenaSmartBridge.pm +++ b/fhem/FHEM/73_GardenaSmartBridge.pm @@ -68,7 +68,7 @@ eval "use JSON;1" or $missingModul .= "JSON "; eval "use IO::Socket::SSL;1" or $missingModul .= "IO::Socket::SSL "; -my $version = "1.0.2"; +my $version = "1.0.3"; @@ -80,6 +80,7 @@ sub GardenaSmartBridge_Initialize($); sub GardenaSmartBridge_Set($@); sub GardenaSmartBridge_Write($@); sub GardenaSmartBridge_Undef($$); +sub GardenaSmartBridge_Delete($$); sub GardenaSmartBridge_ResponseProcessing($$); sub GardenaSmartBridge_ErrorHandling($$$); sub GardenaSmartBridge_encrypt($); @@ -112,6 +113,7 @@ sub GardenaSmartBridge_Initialize($) { $hash->{SetFn} = "GardenaSmartBridge_Set"; $hash->{DefFn} = "GardenaSmartBridge_Define"; $hash->{UndefFn} = "GardenaSmartBridge_Undef"; + $hash->{DeleteFn} = "GardenaSmartBridge_Delete"; $hash->{NotifyFn} = "GardenaSmartBridge_Notify"; $hash->{AttrFn} = "GardenaSmartBridge_Attr"; @@ -163,18 +165,24 @@ sub GardenaSmartBridge_Define($$) { sub GardenaSmartBridge_Undef($$) { - my ( $hash, $arg ) = @_; - - - my $index = $hash->{TYPE}."_".$hash->{NAME}."_passwd"; + my ( $hash, $name ) = @_; + RemoveInternalTimer($hash); - setKeyValue($index,undef); delete $modules{GardenaSmartBridge}{defptr}{BRIDGE} if( defined($modules{GardenaSmartBridge}{defptr}{BRIDGE}) ); return undef; } +sub GardenaSmartBridge_Delete($$) { + + my ( $hash, $name ) = @_; + + + setKeyValue($hash->{TYPE}."_".$name."_passwd",undef); + return undef; +} + sub GardenaSmartBridge_Attr(@) { my ( $cmd, $name, $attrName, $attrVal ) = @_;