2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00

summaryFn should support user defined commands.

git-svn-id: https://svn.fhem.de/fhem/trunk@3134 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-04-30 06:47:48 +00:00
parent ab8512ba19
commit 764e58522b

View File

@ -1066,17 +1066,20 @@ FW_showRoom()
}
$row++;
if($modules{$type}{FW_summaryFn}) {
FW_pO "<td>";
my ($allSets, $cmdlist, $txt) = FW_devState($d, $rf);
my $sfn = $modules{$type}{FW_summaryFn};
if($sfn) {
no strict "refs";
FW_pO &{$modules{$type}{FW_summaryFn}}($FW_wname,$d,$FW_room,\%extPage);
$txt = &{$sfn}($FW_wname, $d, $FW_room, \%extPage);
use strict "refs";
FW_pO "</td>";
next;
FW_pO "<td id=\"$type.$d\">$txt</td>";
} else {
FW_pO "<td id=\"$d\">$txt</td>";
}
my ($allSets, $cmdlist, $txt) = FW_devState($d, $rf);
FW_pO "<td id=\"$d\">$txt</td>";
######
# Commands, slider, dropdown
@ -1114,7 +1117,8 @@ FW_showRoom()
lc(AttrVal($b, "sortby", AttrVal($b,"alias",$b))) }
@atEnds) {
no strict "refs";
FW_pO &{$modules{$defs{$d}{TYPE}}{FW_summaryFn}}($FW_chash, $d, $FW_room, \%extPage);
FW_pO &{$modules{$defs{$d}{TYPE}}{FW_summaryFn}}($FW_chash, $d,
$FW_room, \%extPage);
use strict "refs";
}
FW_pO "</div>";