Skip to content
Snippets Groups Projects
Commit 5e7c3ee1 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '5558-dns-symbol' into 'develop'

Convert @ and * to full hostname

Closes #5463 and #5558

See merge request ispconfig/ispconfig3!1172
parents 517e8dfb e5f24d59
No related branches found
No related tags found
1 merge request!1172Convert @ and * to full hostname
Pipeline #5086 passed
...@@ -112,7 +112,17 @@ class dns_page_action extends tform_actions { ...@@ -112,7 +112,17 @@ class dns_page_action extends tform_actions {
} }
} }
} // end if user is not admin } // end if user is not admin
// Replace @ to example.com.
if($this->dataRecord["name"] === '@') {
$this->dataRecord["name"] = $soa['origin'];
}
// Replace * to *.example.com.
if($this->dataRecord["name"] === '*') {
$this->dataRecord["name"] = '*.' . $soa['origin'];
}
if($this->checkDuplicate()) $app->tform->errorMessage .= $app->tform->lng("data_error_duplicate")."<br>"; if($this->checkDuplicate()) $app->tform->errorMessage .= $app->tform->lng("data_error_duplicate")."<br>";
// Set the server ID of the rr record to the same server ID as the parent record. // Set the server ID of the rr record to the same server ID as the parent record.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment