Merge branch 'master' of github.com:virtualmin/virtualmin-nginx

Author: jcameron

.github/workflows/virtualmin.dev+virtualmin-nginx.yml

@@ -16,7 +16,6 @@ jobs:
       project-name: ${{ github.event.repository.name }}
       is-release: ${{ github.event_name == 'release' }}
     secrets:
-      DEV_GPG_PH: ${{ secrets.DEV_GPG_PH }}
       DEV_IP_ADDR: ${{ secrets.DEV_IP_ADDR }}
       DEV_IP_KNOWN_HOSTS: ${{ secrets.DEV_IP_KNOWN_HOSTS }}
       DEV_UPLOAD_SSH_USER: ${{ secrets.DEV_UPLOAD_SSH_USER }}

save_sdocs.cgi

@@ -30,11 +30,11 @@ if (!&foreign_check("virtual-server")) {
 my $name = &find_value("server_name", $server);
 &webmin_log("sdocs", "server", $name);
 
+my ($return_id, $return_query) = ($in{'id'}, "");
 if (!&foreign_check("virtual-server")) {
 	# Redirect with the the new root directory if it was changed
 	my ($dom, $domroot_curr) = split(/;/, $in{'id'});
 	my $domroot_new = $in{'root'} ? $in{'root'} : undef;
-	my ($return_id, $return_query) = ($in{'id'}, "");
 	if ($domroot_new && $domroot_new ne $domroot_curr) {
 		&foreign_require("virtual-server");
 		my $d = &virtual_server::get_domain_by('dom', $dom);

virtual_feature.pl

@@ -3561,6 +3561,7 @@ sub feature_delete_protected_dir
 if ($loc) {
 	my ($contains_auth_basic_user_file) =
 			grep { $_->{name} eq 'auth_basic_user_file' } @{$loc->{members}};
+	var_dump($contains_auth_basic_user_file, 'contains_auth_basic_user_file');
 	if ($contains_auth_basic_user_file &&
 	    $contains_auth_basic_user_file->{'value'}) {
 		if ($contains_auth_basic_user_file->{'value'} eq $opts->{'protected_user_file_path'}) {