FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

fhem.pl/01_FHEMWEB.pm: avoid adding a NL when saving .PNG (binary). For the hs-harz student project.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9079 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-08-16 10:43:51 +00:00
parent 189ab5c180
commit 4c4e623e7b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1846,12 +1846,19 @@ FW_style($$)
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 $isImg = ($fileName =~ m,\.(svg|png)$,i);
my $forceType = ($cfgDB eq 'configDB' && !$isImg) ? $cfgDB : "file"; my $forceType = ($cfgDB eq 'configDB' && !$isImg) ? $cfgDB : "file";
$FW_data =~ s/\r//g if(!$isImg); $FW_data =~ s/\r//g if(!$isImg);
my $err = FileWrite({FileName=>$filePath, ForceType=>$forceType}, my $err;
if($fileName =~ m,\.png$,) {
$err = FileWrite({FileName=>$filePath,ForceType=>$forceType,NoNL=>1},
$FW_data);
} else {
$err = FileWrite({ FileName=>$filePath, ForceType=>$forceType },
split("\n", $FW_data)); split("\n", $FW_data));
}
if($err) { if($err) {
FW_pO "<div id=\"content\">$filePath: $!</div>"; FW_pO "<div id=\"content\">$filePath: $!</div>";
return; return;

6
fhem/fhem.pl
View File

@ -4196,13 +4196,15 @@ sub
FileWrite($@) FileWrite($@)
{ {
my ($param, @rows) = @_; my ($param, @rows) = @_;
my ($err, @ret, $fileName, $forceType); my ($err, @ret, $fileName, $forceType, $nl);
if(ref($param) eq "HASH") { if(ref($param) eq "HASH") {
$fileName = $param->{FileName}; $fileName = $param->{FileName};
$forceType = $param->{ForceType}; $forceType = $param->{ForceType};
$nl = $param->{NoNL} ? "" : "\n";
} else { } else {
$fileName = $param; $fileName = $param;
$nl = "\n";
} }
$forceType = "" if(!defined($forceType)); $forceType = "" if(!defined($forceType));
@ -4213,7 +4215,7 @@ FileWrite($@)
if(open(FH, ">$fileName")) { if(open(FH, ">$fileName")) {
binmode (FH); binmode (FH);
foreach my $l (@rows) { foreach my $l (@rows) {
print FH $l,"\n"; print FH $l,$nl;
} }
close(FH); close(FH);
return undef; return undef;