From 5a118dda894647ab6a961d87b1b4f8cd5ce8de32 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Tue, 30 Jan 2024 16:41:57 +0100
Subject: [PATCH 1/2] Domains module expects an ID not a string, fixes #6635

---
 interface/web/dns/dns_import.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index a229f3956b..754d08af53 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -190,16 +190,17 @@ if ($settings['use_domain_module'] == 'y') {
 		/* We have domains in the list, so create the drop-down-list */
 		foreach( $domains as $domain) {
 			$domain_select .= "<option value=" . $domain['domain_id'] ;
-			if ($domain['domain'] == $_POST['domain']) {
+			if ($domain['domain_id'] == $_POST['domain']) {
 				$domain_select .= " selected";
+				$selected_domain = $domain['domain'];
 			}
-			$domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . ".</option>\r\n";
+			$domain_select .= ">" . $app->functions->idn_decode($selected_domain) . ".</option>\r\n";
 		}
 	}
 	$app->tpl->setVar("domain_option", $domain_select);
 	/* check if the selected domain can be used! */
-	if ($domain) {
-		$domain_check = $app->tools_sites->checkDomainModuleDomain($domain);
+	if ($selected_domain) {
+		$domain_check = $app->tools_sites->checkDomainModuleDomain($selected_domain);
 		if(!$domain_check) {
 			// invalid domain selected
 			$domain = NULL;
@@ -207,6 +208,7 @@ if ($settings['use_domain_module'] == 'y') {
 			$domain = $domain_check;
 		}
 	}
+	$domain = $selected_domain;
 }
 
 $lng_file = 'lib/lang/'.$app->functions->check_language($_SESSION['s']['language']).'_dns_import.lng';
-- 
GitLab


From 7f6a7e8f82528700ffe2ea168606785f40508202 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Tue, 30 Jan 2024 22:58:16 +0100
Subject: [PATCH 2/2] Minor revert als cleanup

---
 interface/web/dns/dns_import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 754d08af53..fcd93aad8b 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -194,7 +194,7 @@ if ($settings['use_domain_module'] == 'y') {
 				$domain_select .= " selected";
 				$selected_domain = $domain['domain'];
 			}
-			$domain_select .= ">" . $app->functions->idn_decode($selected_domain) . ".</option>\r\n";
+			$domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . ".</option>\r\n";
 		}
 	}
 	$app->tpl->setVar("domain_option", $domain_select);
-- 
GitLab