diff --git a/fhem/CHANGED b/fhem/CHANGED index cec26d732..64ca1d6f8 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. + - feature: 73_NUKIBridge: remove set callbackRemove - bugfix: 70_ONKYO_AVR: fixed attribute model warning for pre2013 - feature: 70_VIERA: new command display web page on TV's browser web address has to start with https:// diff --git a/fhem/FHEM/73_NUKIBridge.pm b/fhem/FHEM/73_NUKIBridge.pm index 14725990c..ec039fc20 100644 --- a/fhem/FHEM/73_NUKIBridge.pm +++ b/fhem/FHEM/73_NUKIBridge.pm @@ -495,7 +495,7 @@ sub Set($@) { } else { my $list = ''; - $list .= 'info:noArg getDeviceList:noArg callbackRemove:noArg '; + $list .= 'info:noArg getDeviceList:noArg '; $list .= 'clearLog:noArg fwUpdate:noArg reboot:noArg factoryReset:noArg' if ( ReadingsVal( $name, 'bridgeType', 'Software' ) eq 'Hardware' ); return ( 'Unknown argument ' . $cmd . ', choose one of ' . $list ); @@ -1028,7 +1028,10 @@ sub getLogfile($$) { Log3( $name, 4, "NUKIBridge ($name) - created Table with log file" ); - my $ret = '
'; + my $header = '' + . '
Log List
'; + + my $ret = $header.'
'; $ret .= ''; foreach my $logs ( @{$decode_json} ) { @@ -1084,27 +1087,43 @@ sub getCallbackList($$) { "NUKIBridge ($name) - Callback data are collected and processed" ); if ( $param->{cl} and $param->{cl}->{TYPE} eq 'FHEMWEB' ) { - if ( ref( $decode_json->{callbacks} ) eq 'ARRAY' - and scalar( @{ $decode_json->{callbacks} } ) > 0 ) - { + if ( ref( $decode_json->{callbacks} ) eq 'ARRAY' ) { Log3( $name, 4, "NUKIBridge ($name) - created Table with log file" ); - my $ret = '
'; + my $space = ' '; + my $aHref; + my $header = '' + . '
Callback List
'; + my $ret = $header.'
'; $ret .= ''; - $ret .= ''; - $ret .= ''; - $ret .= ''; - $ret .= ''; + $ret .= ''; + $ret .= ''; $ret .= ''; - foreach my $cb ( @{ $decode_json->{callbacks} } ) { + if ( scalar( @{ $decode_json->{callbacks} } ) > 0 ) { + foreach my $cb ( @{ $decode_json->{callbacks} } ) { + $aHref = + "{host} + . "/fhem?cmd=set+" + . $name + . "+callbackRemove+" + . $cb->{id} + . $::FW_CSRF + . "\">X"; - $ret .= ''; + $ret .= ''; + $ret .= ''; + $ret .= ''; + } + } + else { + $ret .= ''; + $ret .= ''; $ret .= ''; - $ret .= ''; $ret .= ''; } @@ -1337,7 +1356,7 @@ sub ParseJSON($$) { ], "release_status": "stable", "license": "GPL_2", - "version": "v1.9.15", + "version": "v1.9.16", "x_apiversion": "1.9", "author": [ "Marko Oldenburg "
Callback-ID Callback-URLURLRemove
' . $cb->{id} . '' . $cb->{url} . ''.$aHref.'
nonenone ' . $cb->{url} . '