VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-19 01:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix format_config test

Browse Source
This commit is contained in:
Ilia Rostovtsev
2021-11-04 13:22:13 +03:00
parent c9147a8ca1
commit 471767d1b8
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apache/allmanual_form.cgi
View File

@ -26,7 +26,7 @@ print &ui_form_start("allmanual_save.cgi", "form-data");
print &ui_hidden("file", $in{'file'}),"\n";
# Display nicely too
if ($config{'format_config'}) {
if ($config{'format_config'} ne '0') {
$data = &read_file_lines($in{'file'}, 1);
&format_config($data);
$data = join("\n", @{$data});

2
apache/allmanual_save.cgi
View File

@ -27,7 +27,7 @@ if ($config{'test_manual'}) {
}
}
unlink($temp);
&format_config_file($in{'file'}) if ($config{'format_config'});
&format_config_file($in{'file'}) if ($config{'format_config'} ne '0');
&webmin_log("manual", undef, undef, { 'file' => $in{'file'} });
&redirect("index.cgi?mode=global");

2
apache/apache-lib.pl
View File

@ -2219,7 +2219,7 @@ sub format_modifed_config_files
{
my ($conf_already_tested) = @_;
if($saved_conf_files) {
if ($config{'format_config'}) {
if ($config{'format_config'} ne '0') {
# Test config first if not already
# tested and don't format on error
if (!$conf_already_tested) {

2
apache/manual_form.cgi
View File

@ -93,7 +93,7 @@ for($i=$start; $i<=$end; $i++) {
}
# Display nicely too
if ($config{'format_config'}) {
if ($config{'format_config'} ne '0') {
&format_config(\@buf);
}
$buf = join("\n", @buf);

2
apache/manual_save.cgi
View File

@ -64,7 +64,7 @@ if (!defined($start)) {
$end = @$lref - 1;
}
splice(@$lref, $start, $end-$start+1, @dirs);
&format_config($lref) if ($config{'format_config'});
&format_config($lref) if ($config{'format_config'} ne '0');
&flush_file_lines();
if ($config{'test_manual'}) {
$err = &test_config();