FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-16 04:36:02 +00:00
Code Issues Releases Wiki Activity

01_FHEMWEB.pm: Color SVG for /icon/ (Forum #38294), fix potential iOS problems (Forum #20294)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8788 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-06-21 06:27:02 +00:00
parent 86a0e3ee63
commit e6d4328def
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/01_FHEMWEB.pm
View File

@ -431,9 +431,8 @@ FW_Read($$)
} }
my $cacheable = FW_answerCall($arg); my $cacheable = FW_answerCall($arg);
if($cacheable == -1){ if($cacheable == -1) {
# Longpoll / inform request; FW_closeConn($hash);
POSIX::exit(0) if($hash->{isChild});
return; return;
} }
@ -468,7 +467,7 @@ FW_Read($$)
delete($defs{$name}); delete($defs{$name});
} }
POSIX::exit(0) if($hash->{isChild}); FW_closeConn($hash);
} }
sub sub
@ -525,10 +524,14 @@ FW_answerCall($)
# if we do not have the icon, we convert the device state to the icon name # if we do not have the icon, we convert the device state to the icon name
if(!$iconPath) { if(!$iconPath) {
($icon, undef, undef) = FW_dev2image($icon); my ($img, $link, $isHtml) = FW_dev2image($icon);
$cacheable = 0; $cacheable = 0;
return 0 if(!$icon); return 0 if(!$img);
$iconPath = FW_iconPath($icon); $iconPath = FW_iconPath($img);
if($iconPath =~ m/\.svg$/i) {
FW_pO FW_makeImage($img, $img);
return 0;
}
} }
$iconPath =~ m/(.*)\.([^.]*)/; $iconPath =~ m/(.*)\.([^.]*)/;
return FW_serveSpecial($1, $2, $FW_icondir, $cacheable); return FW_serveSpecial($1, $2, $FW_icondir, $cacheable);