Skip to content
GitLab
Commit b90765c7 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '5709-system-dns-tab-dns-record-filtering' into '1.3-dev' 

Resolve "System - DNS Tab - DNS record filtering"

Closes #5709

See merge request !44
parents 7766188a e7652263
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
+1 -1
dns/admin/systems/class_dnsHost.inc
+ 1
− 1
View file @ b90765c7
...@@ -83,7 +83,7 @@ class DnsRecordsFilteredAttribute extends DnsRecordsAttribute ...@@ -83,7 +83,7 @@ class DnsRecordsFilteredAttribute extends DnsRecordsAttribute
} }
$ips = $this->plugin->parent->getBaseObject()->ipHostNumber; $ips = $this->plugin->parent->getBaseObject()->ipHostNumber;
$cn = preg_replace('/\$$/', '', $this->plugin->parent->getBaseObject()->cn); $cn = preg_replace('/\$$/', '', $this->plugin->parent->getBaseObject()->cn);
if (in_array($values[2], $ips) || ($values[0] == $cn) || preg_match('/'.preg_quote($cn.'.'.$this->getZoneName(), '/i').'/', $value[2])) { if (in_array($values[2], $ips) || (!empty($cn) && (($values[0] == $cn) || preg_match('/'.preg_quote($cn.'.'.$this->getZoneName(), '/i').'/', $value[2])))) {
return $values; return $values;
} else { } else {
return array(); return array();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment