FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

73_NUKIBridge: remove set callbackRemove

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20994 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-01-16 08:42:29 +00:00
parent 7408852ba1
commit 58e995d9d7
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/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.
- feature: 73_NUKIBridge: remove set callbackRemove
- bugfix: 70_ONKYO_AVR: fixed attribute model warning for pre2013 - bugfix: 70_ONKYO_AVR: fixed attribute model warning for pre2013
- feature: 70_VIERA: new command display web page on TV's browser - feature: 70_VIERA: new command display web page on TV's browser
web address has to start with https:// web address has to start with https://

47
fhem/FHEM/73_NUKIBridge.pm
View File

@ -495,7 +495,7 @@ sub Set($@) {
} }
else { else {
my $list = ''; my $list = '';
$list .= 'info:noArg getDeviceList:noArg callbackRemove:noArg '; $list .= 'info:noArg getDeviceList:noArg ';
$list .= 'clearLog:noArg fwUpdate:noArg reboot:noArg factoryReset:noArg' $list .= 'clearLog:noArg fwUpdate:noArg reboot:noArg factoryReset:noArg'
if ( ReadingsVal( $name, 'bridgeType', 'Software' ) eq 'Hardware' ); if ( ReadingsVal( $name, 'bridgeType', 'Software' ) eq 'Hardware' );
return ( 'Unknown argument ' . $cmd . ', choose one of ' . $list ); return ( 'Unknown argument ' . $cmd . ', choose one of ' . $list );
@ -1028,7 +1028,10 @@ sub getLogfile($$) {
Log3( $name, 4, Log3( $name, 4,
"NUKIBridge ($name) - created Table with log file" ); "NUKIBridge ($name) - created Table with log file" );
my $ret = '<html><table width=100%><tr><td>'; my $header = '<html>'
. '<div style="float: left">Log List</div>';
my $ret = $header.'<table width=100%><tr><td>';
$ret .= '<table class="block wide">'; $ret .= '<table class="block wide">';
foreach my $logs ( @{$decode_json} ) { foreach my $logs ( @{$decode_json} ) {
@ -1084,27 +1087,43 @@ sub getCallbackList($$) {
"NUKIBridge ($name) - Callback data are collected and processed" ); "NUKIBridge ($name) - Callback data are collected and processed" );
if ( $param->{cl} and $param->{cl}->{TYPE} eq 'FHEMWEB' ) { if ( $param->{cl} and $param->{cl}->{TYPE} eq 'FHEMWEB' ) {
if ( ref( $decode_json->{callbacks} ) eq 'ARRAY' if ( ref( $decode_json->{callbacks} ) eq 'ARRAY' ) {
and scalar( @{ $decode_json->{callbacks} } ) > 0 )
{
Log3( $name, 4, Log3( $name, 4,
"NUKIBridge ($name) - created Table with log file" ); "NUKIBridge ($name) - created Table with log file" );
my $ret = '<html><table width=100%><tr><td>'; my $space = '&nbsp;';
my $aHref;
my $header = '<html>'
. '<div style="float: left">Callback List</div>';
my $ret = $header.'<table width=100%><tr><td>';
$ret .= '<table class="block wide">'; $ret .= '<table class="block wide">';
$ret .= '<tr class="odd">'; $ret .= '<tr class="odd">';
$ret .= '<td><b>Callback-ID</b></td>'; $ret .= '<td><b>URL</b></td>';
$ret .= '<td> </td>'; $ret .= '<td><b>Remove</b></td>';
$ret .= '<td><b>Callback-URL</b></td>';
$ret .= '</tr>'; $ret .= '</tr>';
foreach my $cb ( @{ $decode_json->{callbacks} } ) { if ( scalar( @{ $decode_json->{callbacks} } ) > 0 ) {
foreach my $cb ( @{ $decode_json->{callbacks} } ) {
$aHref =
"<a href=\""
. $::FW_httpheader->{host}
. "/fhem?cmd=set+"
. $name
. "+callbackRemove+"
. $cb->{id}
. $::FW_CSRF
. "\"><font color=\"red\"><b>X</b></font></a>";
$ret .= '<td>' . $cb->{id} . '</td>'; $ret .= '<td>' . $cb->{url} . '</td>';
$ret .= '<td>'.$aHref.'</td>';
$ret .= '</tr>';
}
}
else {
$ret .= '<td>none</td>';
$ret .= '<td>none</td>';
$ret .= '<td> </td>'; $ret .= '<td> </td>';
$ret .= '<td>' . $cb->{url} . '</td>';
$ret .= '</tr>'; $ret .= '</tr>';
} }
@ -1337,7 +1356,7 @@ sub ParseJSON($$) {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v1.9.15", "version": "v1.9.16",
"x_apiversion": "1.9", "x_apiversion": "1.9",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"