Treat domain as missing if file is empty https://forum.virtualmin.com…

…/t/domains-showing-as-numbers/113237/14
virtualmin · Feb 6, 2022 · faaa880 · faaa880 · iliajie · Feb 6, 2022
1 parent 8edca10
commit faaa880
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/restore-domain.pl b/restore-domain.pl
@@ -336,6 +336,10 @@ package virtual_server;
 	}
 foreach $dname (@rdoms) {
 	local $dinfo = &get_domain_by("dom", $dname);
+	if (!$dinfo->{'id'}) {
+		# File is actually empty!
+		$dinfo = undef;
+		}
 	if ($dname eq "virtualmin") {
 		$got_vbs = 1;
 		}

diff --git a/restore.cgi b/restore.cgi
@@ -181,6 +181,10 @@ if ($in{'confirm'}) {
 			next;
 			}
 		local $dinfo = &get_domain_by("dom", $d);
+		if (!$dinfo->{'id'}) {
+			# File is actually empty!
+			$dinfo = undef;
+			}
 		if ($dinfo) {
 			&can_edit_domain($dinfo) ||
 				&error(&text('restore_ecannotdom',