Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting changed FWEXT->FUNC interface: FLOORPLAN compatibility problem

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3208 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-05-22 19:06:14 +00:00
parent e3e49c3975
commit 572354a38c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/01_FHEMWEB.pm
View File

@ -453,12 +453,11 @@ FW_answerCall($)
next if($arg !~ m/^$k/ || $h !~ m/HASH/ || !$h->{FUNC}); next if($arg !~ m/^$k/ || $h !~ m/HASH/ || !$h->{FUNC});
no strict "refs"; no strict "refs";
#Returns undef if it already sent a HTTP header #Returns undef if it already sent a HTTP header
($FW_RETTYPE, $FW_RET) = &{$h->{FUNC}}($arg); my $localType;
($localType, $FW_RET) = &{$h->{FUNC}}($arg);
use strict "refs"; use strict "refs";
if(!$FW_RET) { last if($FW_RET && $FW_RET eq "continue"); # Continue displaying the data
$FW_RETTYPE = "text/html; charset=$FW_encoding"; $FW_RETTYPE = $localType;
last;
}
return defined($FW_RETTYPE) ? 0 : -1; return defined($FW_RETTYPE) ? 0 : -1;
} }
} }

7
fhem/FHEM/98_weblink.pm
View File

@ -391,13 +391,13 @@ weblink_WriteGplot($)
for(my $i=0; $i <= 8; $i++) { for(my $i=0; $i <= 8; $i++) {
$hasTl = 1 if($FW_webArgs{"title_$i"}); $hasTl = 1 if($FW_webArgs{"title_$i"});
} }
return if(!$hasTl); return (undef, "continue") if(!$hasTl);
my $fName = $FW_webArgs{gplotName}; my $fName = $FW_webArgs{gplotName};
return if(!$fName); return (undef, "continue") if(!$fName);
if(!open(FH, ">$fName")) { if(!open(FH, ">$fName")) {
Log 1, "weblink_WriteGplot: Can't write $fName"; Log 1, "weblink_WriteGplot: Can't write $fName";
return; return (undef, "continue");
} }
print FH "# Created by FHEMWEB, ".TimeNow()."\n"; print FH "# Created by FHEMWEB, ".TimeNow()."\n";
print FH "set terminal png transparent size <SIZE> crop\n"; print FH "set terminal png transparent size <SIZE> crop\n";
@ -440,6 +440,7 @@ weblink_WriteGplot($)
#foreach my $k (sort keys %FW_webArgs) { #foreach my $k (sort keys %FW_webArgs) {
# Log 1, "$k: $FW_webArgs{$k}"; # Log 1, "$k: $FW_webArgs{$k}";
#} #}
return (undef, "continue");
} }
1; 1;