fmDNS - #409 - Fixed multiple NAPTR record values

WillyXJ · Mar 8, 2018 · 3b65a65 · 3b65a65
1 parent 00b8a7d
commit 3b65a65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/server/fm-modules/fmDNS/change.log b/server/fm-modules/fmDNS/change.log
@@ -3,6 +3,7 @@
 * Server - [bug] Fixed a fatal error during client interactions.
 * Server - [bug] Fixed automatic PTR creations when using a class A reverse
            zone. (Issue #408)
+* Server - [bug] Fixed support for multiple NAPTR record values. (Issue #409)
 
 3.1.1 (2017-12-14)
 ==================

diff --git a/server/fm-modules/fmDNS/classes/class_records.php b/server/fm-modules/fmDNS/classes/class_records.php
@@ -66,6 +66,9 @@ function add($domain_id, $record_type, $new_array, $operation = 'insert') {
 		if ($record_type != 'SOA') {
 			$query = "SELECT * FROM fm_{$__FM_CONFIG['fmDNS']['prefix']}records WHERE domain_id=$domain_id AND record_name='{$new_array['record_name']}'
 					AND record_value='{$new_array['record_value']}' AND record_type='$record_type' AND record_status != 'deleted'";
+			if ($record_type == 'NAPTR') {
+				$query .= " AND record_params='{$new_array['record_params']}' AND record_regex='{$new_array['record_regex']}'";
+			}
 			$result = $fmdb->get_results($query);
 
 			if ($fmdb->num_rows) {