Fix some bugs when domain exists or not

hestiacp · Feb 16, 2024 · bef5d7b · bef5d7b
1 parent 30f2c81
commit bef5d7b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/bin/v-restore-dns-domain-restic b/bin/v-restore-dns-domain-restic
@@ -57,6 +57,7 @@ fi
 
 parse_object_kv_list $(cat "$tmpdir/backup.conf")
 IFS=','
+domains=''
 read -a domains_array <<< "$dns"
 read -a domains <<< "$DNS"
 for domain in $domains; do
@@ -67,7 +68,7 @@ for domain in $domains; do
 		check_config=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
 		if [ -z "$check_config" ]; then
 			check_new=$(is_domain_new 'dns' "$domain")
-			if [ -n "$check_new" ]; then
+			if [ "$check_new" = "yes" ]; then
 				rm -rf $tmpdir
 				error="$domain belongs to another user"
 				echo "$error" | $SENDMAIL -s "$subj" "$email" "$notify"

diff --git a/bin/v-restore-mail-domain-restic b/bin/v-restore-mail-domain-restic
@@ -76,7 +76,7 @@ for domain in $domains; do
 		check_config=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf)
 		if [ -z "$check_config" ]; then
 			check_new=$(is_domain_new 'mail' $domain)
-			if [ -n "$check_new" ]; then
+			if [ "$check_new" = 'yes' ]; then
 				rm -rf $tmpdir
 				error="$domain belongs to another user"
 				echo "$error" | $SENDMAIL -s "$subj" $email $notify

diff --git a/bin/v-restore-web-domain-restic b/bin/v-restore-web-domain-restic
@@ -75,8 +75,8 @@ for domain in $domains; do
 		# Checking domain existence
 		check_config=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf)
 		if [ -z "$check_config" ]; then
-			check_new=$(is_domain_new 'dns' $domain)
-			if [ -n "$check_new" ]; then
+			check_new=$(is_domain_new 'web' $domain)
+			if [ "$check_new" = 'yes' ]; then
 				rm -rf $tmpdir
 				error="$domain belongs to another user"
 				echo "$error" | $SENDMAIL -s "$subj" $email $notify