michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2019-12-20 20:25:54 -08:00
parent a381969d4b 19bda9c5b4
commit 2d71cdfd34
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web-lib-funcs.pl
View File

@@ -9014,7 +9014,7 @@ else {
if (-d $file) {
# Cannot open a directory!
if ($noerror) { return 0; }
else { &error("Cannot write to directory $file"); }
else { &error("Cannot write to directory @{[html_escape($file)]}"); }
}
my @oldst = stat($file);
my $directopen = 0;
@@ -9031,7 +9031,7 @@ else {
$main::open_temphandles{$fh} = $file;
}
if (!$ex && !$noerror) {
&error(&text("efileopen", $file, $!));
&error(&text("efileopen", html_escape($file), $!));
}
binmode($fh);
if (@oldst && !$directopen) {
@@ -9050,7 +9050,7 @@ else {
&reset_file_attributes($file, \@old_attributes);
$main::open_temphandles{$fh} = $file;
if (!$ex && !$noerror) {
&error(&text("efileopen", $file, $!));
&error(&text("efileopen", html_escape($file), $!));
}
binmode($fh);
return $ex;
@@ -9065,7 +9065,7 @@ else {
&reset_file_attributes($file, \@old_attributes);
$main::open_temphandles{$fh} = $file;
if (!$ex && !$noerror) {
&error(&text("efileopen", $file, $!));
&error(&text("efileopen", html_escape($file), $!));
}
binmode($fh);
return $ex;
@@ -9123,7 +9123,7 @@ elsif (defined($main::open_tempfiles{$_[0]})) {
my @old_attributes = &get_clear_file_attributes($_[0]);
if (!rename($main::open_tempfiles{$_[0]}, $_[0])) {
if ($noerror) { return 0; }
else { &error("Failed to replace $_[0] with $main::open_tempfiles{$_[0]} : $!"); }
else { &error("Failed to replace @{[html_escape($_[0])]} with @{[html_escape($main::open_tempfiles{$_[0]})]} : $!"); }
}
if (@st) {
# Set original permissions and ownership