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

01_FHEMWEB.pm: image upload should always go to the filesystem

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9034 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-08-08 13:39:49 +00:00
parent 08256c4559
commit 3b8e93cb17
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1841,13 +1841,14 @@ FW_style($$)
} elsif($a[1] eq "save") { } elsif($a[1] eq "save") {
my $fileName = $a[2]; my $fileName = $a[2];
my $cfgDB = defined($a[3]) ? $a[3] : ""; my $cfgDB = defined($a[3]) ? $a[3] : "";
my $forceType = ($cfgDB eq 'configDB') ? $cfgDB : "file";
$fileName = $FW_webArgs{saveName} $fileName = $FW_webArgs{saveName}
if($FW_webArgs{saveAs} && $FW_webArgs{saveName}); if($FW_webArgs{saveAs} && $FW_webArgs{saveName});
$fileName =~ s,.*/,,g; # Little bit of security $fileName =~ s,.*/,,g; # Little bit of security
my $filePath = FW_fileNameToPath($fileName); my $filePath = FW_fileNameToPath($fileName);
my $isImg = ($fileName =~ m,\.(svg|png)$,);
my $forceType = ($cfgDB eq 'configDB' && !$isImg) ? $cfgDB : "file";
$FW_data =~ s/\r//g if($fileName !~ m,\.png$,); $FW_data =~ s/\r//g if(!$isImg);
my $err = FileWrite({FileName=>$filePath, ForceType=>$forceType}, my $err = FileWrite({FileName=>$filePath, ForceType=>$forceType},
split("\n", $FW_data)); split("\n", $FW_data));
if($err) { if($err) {
@ -1856,7 +1857,7 @@ FW_style($$)
} }
my $ret = FW_fC("rereadcfg") if($filePath eq $attr{global}{configfile}); my $ret = FW_fC("rereadcfg") if($filePath eq $attr{global}{configfile});
$ret = FW_fC("reload $fileName") if($fileName =~ m,\.pm$,); $ret = FW_fC("reload $fileName") if($fileName =~ m,\.pm$,);
$ret = FW_Set("","","rereadicons") if($fileName =~ m,\.(svg|png)$,); $ret = FW_Set("","","rereadicons") if($isImg);
DoTrigger("global", "FILEWRITE $filePath", 1) if(!$ret); # Forum #32592 DoTrigger("global", "FILEWRITE $filePath", 1) if(!$ret); # Forum #32592
$ret = ($ret ? "<h3>ERROR:</h3><b>$ret</b>" : $ret = ($ret ? "<h3>ERROR:</h3><b>$ret</b>" :
"Saved the file $fileName to $forceType"); "Saved the file $fileName to $forceType");