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

Fix to format config only at the very end if no issues

Browse Source
This commit is contained in:
Ilia Rostovtsev
2021-11-05 01:48:43 +03:00
parent 6ccfd2c7bc
commit 0ec35a3581
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apache/change_dir.cgi
View File

@@ -41,9 +41,10 @@ else {
}
&flush_file_lines();
&unlock_file($d->{'file'});
&format_config_file($d->{'file'});
&update_last_config_change();
&after_changing();
&format_config_file($d->{'file'});
&webmin_log("dir", $in{'delete'} ? 'delete' : 'save',
&virtual_name($v, 1).":".$d->{'words'}->[0], \%in);

3
apache/change_files.cgi
View File

@@ -36,9 +36,10 @@ else {
}
&flush_file_lines();
&unlock_file($d->{'file'});
&format_config_file($d->{'file'});
&update_last_config_change();
&after_changing();
&format_config_file($d->{'file'});
&webmin_log("files", $in{'delete'} ? 'delete' : 'save',
"$in{'file'}:$d->{'words'}->[0]", \%in);

3
apache/create_dir.cgi
View File

@@ -39,9 +39,10 @@ else {
&flush_file_lines();
&update_last_config_change();
&unlock_file($vconf->[0]->{'file'});
&format_config_file($vconf->[0]->{'file'});
&after_changing();
&format_config_file($vconf->[0]->{'file'});
&webmin_log("dir", "create", &virtual_name($v, 1).":$in{'path'}", \%in);
&redirect("virt_index.cgi?virt=$in{'virt'}");

3
apache/create_files.cgi
View File

@@ -33,9 +33,10 @@ else {
&flush_file_lines();
&update_last_config_change();
&unlock_file($in{'file'});
&format_config_file($in{'file'});
&after_changing();
&format_config_file($in{'file'});
&webmin_log("files", "create", "$in{'file'}:$in{'path'}", \%in);
&redirect("htaccess_index.cgi?file=".&urlize($in{'file'}));

2
apache/create_virt.cgi
View File

@@ -246,7 +246,6 @@ foreach my $m (@{$dirsect->{'members'}}) {
&save_directive_struct(undef, $virt, $conf, $conf);
&flush_file_lines();
&unlock_file($f);
&format_config_file($f);
&update_last_config_change();
&unlock_apache_files();
@@ -273,6 +272,7 @@ if (!$found) {
}
&after_changing();
&format_config_file($f);
&webmin_log("virt", "create", ($in{'name_def'} ? $addr : $in{'name'}).$port,
\%in);