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

FHEMWEB: reduce configDB dependant code (by betateilchen, Forum #22927)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6031 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-06-02 07:19:40 +00:00
parent 39bea5a4ec
commit 329340a068
1 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1635,21 +1635,15 @@ FW_style($$)
my $fileName = $a[2]; my $fileName = $a[2];
my $data = ""; my $data = "";
my $cfgDB = defined($a[3]) ? $a[3] : ""; my $cfgDB = defined($a[3]) ? $a[3] : "";
if ($cfgDB eq 'configDB') { my $forceType = ($cfgDB eq 'configDB') ? $cfgDB : "file";
my $filePath = FW_fileNameToPath($fileName); $fileName =~ s,.*/,,g; # Little bit of security
my ($err,@content) = cfgDB_FileRead($filePath); my $filePath = FW_fileNameToPath($fileName);
$data = join("\n",@content); my($err, @content) = FileRead({FileName=>$filePath, ForceType=>$forceType} );
} else { if($err) {
$fileName =~ s,.*/,,g; # Little bit of security FW_pO "<div id=\"content\">$err</div>";
my $filePath = FW_fileNameToPath($fileName); return;
my($err, @data) = FileRead({FileName=>$filePath, ForceType=>"file"} );
if($err) {
FW_pO "<div id=\"content\">$err</div>";
return;
}
$data = join("\n", @data);
close(FH);
} }
$data = join("\n", @content);
$data =~ s/&/&amp;/g; $data =~ s/&/&amp;/g;
@ -1670,35 +1664,23 @@ 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);
if($cfgDB ne 'configDB') { # save file to filesystem $FW_data =~ s/\r//g;
my $err = FileWrite({FileName=>$filePath, ForceType=>$forceType}, split("\n", $FW_data));
$FW_data =~ s/\r//g; if($err) {
my $err = FileWrite({FileName=>$filePath, ForceType=>"file"}, split("\n", $FW_data)); FW_pO "<div id=\"content\">$filePath: $!</div>";
if($err) { return;
FW_pO "<div id=\"content\">$filePath: $!</div>";
return;
}
my $ret = FW_fC("rereadcfg") if($filePath eq $attr{global}{configfile});
$ret = FW_fC("reload $fileName") if($fileName =~ m,\.pm$,);
$ret = ($ret ? "<h3>ERROR:</h3><b>$ret</b>" : "Saved the file $fileName");
FW_style("style list", $ret);
$ret = "";
} else { # save file to configDB
$FW_data =~ s/\r//g if($^O !~ m/Win/);
my @content = split(/\n/,$FW_data);
cfgDB_FileWrite($filePath,@content);
my $ret = FW_fC("reload $fileName") if($fileName =~ m,\.pm$,);
$ret = ($ret ? "<h3>ERROR:</h3><b>$ret</b>" :
"Saved the file $fileName to configDB");
FW_style("style list", $ret);
$ret = "";
} }
my $ret = FW_fC("rereadcfg") if($filePath eq $attr{global}{configfile});
$ret = FW_fC("reload $fileName") if($fileName =~ m,\.pm$,);
$ret = ($ret ? "<h3>ERROR:</h3><b>$ret</b>" : "Saved the file $fileName to $forceType");
FW_style("style list", $ret);
$ret = "";
} elsif($a[1] eq "iconFor") { } elsif($a[1] eq "iconFor") {
FW_iconTable("iconFor", "icon", "style setIF $a[2] %s", undef); FW_iconTable("iconFor", "icon", "style setIF $a[2] %s", undef);