From 915285e96bf26e647c302a400e711ee91faf1a89 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sat, 8 Aug 2015 13:25:18 +0000 Subject: [PATCH] 01_FHEMWEB.pm: enable the upload of icons for a hs-harz.de project. git-svn-id: https://svn.fhem.de/fhem/trunk@9032 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index a821aa9e1..5909b3f6c 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -1729,8 +1729,12 @@ FW_fileNameToPath($) my $cfgFileName = $1; if($name eq $cfgFileName) { return $attr{global}{configfile}; - } elsif($name =~ m/.*(css|svg)$/) { + } elsif($name =~ m/.*(css|_defs.svg)$/) { return "$FW_cssdir/$name"; + } elsif($name =~ m/.*(png|svg)$/) { + my $d=""; + map { $d = $_ if(!$d && -d "$FW_icondir/$_") } @FW_iconDirs; + return "$FW_icondir/$d/$name"; } elsif($name =~ m/.*gplot$/) { return "$FW_gplotdir/$name"; } else { @@ -1852,6 +1856,7 @@ FW_style($$) } my $ret = FW_fC("rereadcfg") if($filePath eq $attr{global}{configfile}); $ret = FW_fC("reload $fileName") if($fileName =~ m,\.pm$,); + $ret = FW_Set("","","rereadicons") if($fileName =~ m,\.(svg|png)$,); DoTrigger("global", "FILEWRITE $filePath", 1) if(!$ret); # Forum #32592 $ret = ($ret ? "

ERROR:

$ret" : "Saved the file $fileName to $forceType");