From 56d9a0abdbb867393f1f6dc5ce041ebb5b14c326 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Tue, 29 Aug 2023 22:24:45 +0300 Subject: [PATCH] Fix to properly disable website https://github.com/virtualmin/virtualmin-gpl/issues/631 --- virtual_feature.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/virtual_feature.pl b/virtual_feature.pl index c9676d4..6d11ab9 100644 --- a/virtual_feature.pl +++ b/virtual_feature.pl @@ -823,12 +823,8 @@ sub feature_disable # Disable is done via default website page my $def_tpl = &read_file_contents("$virtual_server::default_content_dir/index.html"); my %hashtmp = %$d; - $hashtmp{'TMPLTTITLE'} = $virtual_server::text{'deftmplt_website_disabled'}; - $hashtmp{'TMPLTSLOGAN'} = $virtual_server::text{'deftmplt_disable_slog'}; - if ($d->{'disabled_why'}) { - $hashtmp{'TMPLTCONTENT'} = $d->{'disabled_why'}; - } - %hashtmp = &virtual_server::populate_default_index_page(%hashtmp); + %hashtmp = &virtual_server::populate_default_index_page($d, %hashtmp); + $def_tpl = &virtual_server::replace_default_index_page($d, $def_tpl); $def_tpl = &virtual_server::substitute_virtualmin_template($def_tpl, \%hashtmp); my $msg = $tmpl->{'disabled_web'} eq 'none' ? $def_tpl :