Merge pull request #93 from binsky08/issue-92-hotfix

hotfix for idn_to_ascii() using php7.4-intl
jethrocarr · Oct 7, 2020 · a4c1377 · a4c1377
2 parents 41816c8 + 58cca54
commit a4c1377
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bind/include/application/inc_bind.php b/bind/include/application/inc_bind.php
@@ -502,7 +502,7 @@ function action_generate_zonefile( $domain_name, $domain_id )
 				if (function_exists("idn_to_ascii"))
 				{
 					$record["record_name"]		= idn_to_ascii($record["record_name"]);
-					$record["record_content"]	= idn_to_ascii($record["record_content"]);
+					$record["record_content"]	= idn_to_ascii($record["record_content"], IDNA_DEFAULT, INTL_IDNA_VARIANT_2003);
 				}
 
 				// handle origin and content format
@@ -537,7 +537,7 @@ function action_generate_zonefile( $domain_name, $domain_id )
 				if (function_exists("idn_to_ascii"))
 				{
 					$record["record_name"]		= idn_to_ascii($record["record_name"]);
-					$record["record_content"]	= idn_to_ascii($record["record_content"]);
+					$record["record_content"]	= idn_to_ascii($record["record_content"], IDNA_DEFAULT, INTL_IDNA_VARIANT_2003);
 				}
 
 				// handle origin and content format
@@ -570,7 +570,7 @@ function action_generate_zonefile( $domain_name, $domain_id )
 				if (function_exists("idn_to_ascii"))
 				{
 					$record["record_name"]		= idn_to_ascii($record["record_name"]);
-					$record["record_content"]	= idn_to_ascii($record["record_content"]);
+					$record["record_content"]	= idn_to_ascii($record["record_content"], IDNA_DEFAULT, INTL_IDNA_VARIANT_2003);
 				}
 
 				if (strpos($record["record_name"], "ip6.arpa"))
@@ -597,7 +597,7 @@ function action_generate_zonefile( $domain_name, $domain_id )
 				if (function_exists("idn_to_ascii"))
 				{
 					$record["record_name"]		= idn_to_ascii($record["record_name"]);
-					$record["record_content"]	= idn_to_ascii($record["record_content"]);
+					$record["record_content"]	= idn_to_ascii($record["record_content"], IDNA_DEFAULT, INTL_IDNA_VARIANT_2003);
 				}
 
 				if (preg_match("/\./", $record["record_name"]) && preg_match("/". $domain_name ."$/", $record["record_name"]))
@@ -638,7 +638,7 @@ function action_generate_zonefile( $domain_name, $domain_id )
 
 					// idn_to_ascii has a lovely habit of blowing up with some record values, such as
 					// DKIM records. If idn_to_ascii fails, we leave the value unchanged
-					if ($tmp = idn_to_ascii($record["record_content"]))
+					if ($tmp = idn_to_ascii($record["record_content"], IDNA_DEFAULT, INTL_IDNA_VARIANT_2003))
 					{
 						$record["record_content"] = $tmp;
 					}

diff --git a/htdocs/include/application/inc_domain.php b/htdocs/include/application/inc_domain.php
@@ -326,7 +326,7 @@ function load_data_record_all($exclude_forwardrev = NULL)
 				if ($this->format == 'idn')
 				{
 					$data_records["name"]		= idn_to_ascii($data_records["name"]);
-					$data_records["content"]	= idn_to_ascii($data_records["content"]);
+					$data_records["content"]	= idn_to_ascii($data_records["content"], IDNA_DEFAULT, INTL_IDNA_VARIANT_2003);
 				}
 
 				$this->data["records"][] = $data_records;