FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-25 15:59:21 +00:00
Code Issues Releases Wiki Activity

FLOORPLAN: bugfix for call of ext. javascripts

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8062 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ulimaass 2015-02-22 08:18:15 +00:00
parent 040b31414e
commit f5e5d1142b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/95_FLOORPLAN.pm
View File

@ -392,7 +392,6 @@ FP_digestCgi($) {
%FP_webArgs = ();
$FP_fwdetail = undef;
$arg =~ s,^[?/],,;
my ($atop, $aleft, $drop) = ""; #mod
foreach my $pv (split("&", $arg)) { # per each URL-section devided by &
next if($pv eq ""); # happens when post forgot to set FW_ME
$pv =~ s/\+/ /g;
@ -496,7 +495,7 @@ FP_htmlHeader($) {
next if($h !~ m/HASH/ || !$h->{SCRIPT} || $h->{SCRIPT} =~ m+pgm2/jquery+);
my $script = $h->{SCRIPT};
$script = ($script =~ m,^/,) ? "$FW_ME$script" : "$FW_ME/pgm2/$script";
FW_pO sprintf($jsTemplate, $script) if ($script);
FW_pO sprintf($jsTemplate, "", $script) if ($script);
}
}
@ -622,7 +621,7 @@ FP_show(){
my $fp_fpimage = AttrVal("$d","fp_$FP_name".".image", undef); # floorplan-dependent icon
if ($fp_image) {
my $state = ReadingsVal($d, "state", undef);
$fp_image =~ s/\{state\}/$state/; # replace {state} by actual device-status
$fp_image =~ s/\{state\}/$state/; # replace {state} by actual device-status
$txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_image\"/; # replace icon-link in html
$txt =~ s/\<img\ (.*) src\=\"(.*)\"/\<img\ $1 src\=\"\/fhem\/images\/default\/$fp_image\"/; # replace icon-link in html (new)
}