mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to webCmdFn/SCRIPT, proposed by Andre

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3105 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-04-23 10:50:57 +00:00
parent 59561416d3
commit abc697c78b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/01_FHEMWEB.pm
View File

@@ -532,8 +532,9 @@ FW_answerCall($)
foreach my $k (sort keys %{$data{FWEXT}}) {
my $h = $data{FWEXT}{$k};
next if($h !~ m/HASH/ || !$h->{SCRIPT});
FW_pO "<script type=\"text/javascript\" ".
"src=\"$FW_ME/pgm2/$h->{SCRIPT}\"></script>";
my $script = $h->{SCRIPT};
$script = ($script =~ m,^/,) ? "$FW_ME$script" : "$FW_ME/pgm2/$script";
FW_pO "<script type=\"text/javascript\" src=\"$script\"></script>";
}
}
@@ -1079,7 +1080,8 @@ FW_showRoom()
my $values = $1;
foreach my $fn (sort keys %{$data{webCmdFn}}) {
no strict "refs";
$htmlTxt = &{$data{webCmdFn}{$fn}}($d,$cmd,$values);
$htmlTxt = &{$data{webCmdFn}{$fn}}($FW_wname,
$d, $FW_room, $cmd, $values);
use strict "refs";
last if($htmlTxt);
}
@@ -2451,7 +2453,7 @@ FW_htmlEscape($)
sub
FW_sliderFn($$$)
{
my ($d,$cmd,$values) = @_;
my ($FW_wname, $d, $FW_room, $cmd, $values) = @_;
return undef if($values !~ m/^slider,(.*),(.*),(.*)$/);
my ($min,$stp, $max) = ($1, $2, $3);
@@ -2474,7 +2476,7 @@ FW_sliderFn($$$)
sub
FW_timepickerFn()
{
my ($d,$cmd,$values) = @_;
my ($FW_wname, $d, $FW_room, $cmd, $values) = @_;
return undef if($values ne "time");
my $srf = $FW_room ? "&room=$FW_room" : "";
@@ -2490,7 +2492,7 @@ FW_timepickerFn()
sub
FW_dropdownFn()
{
my ($d,$cmd,$values) = @_;
my ($FW_wname, $d, $FW_room, $cmd, $values) = @_;
my @tv = split(",", $values);
# Hack: eventmap (translation only) should not result in a