Commit 056b11eb authored by mcramer's avatar mcramer
Browse files

Bugfix: wrong host name when using domain module

parent d6363ba9
...@@ -288,7 +288,6 @@ class page_action extends tform_actions { ...@@ -288,7 +288,6 @@ class page_action extends tform_actions {
$this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"]; $this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"];
$this->dataRecord["client_group_id"] = $parent_domain["client_group_id"]; $this->dataRecord["client_group_id"] = $parent_domain["client_group_id"];
$this->dataRecord["vhost_type"] = 'name'; $this->dataRecord["vhost_type"] = 'name';
$this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
$this->parent_domain_record = $parent_domain; $this->parent_domain_record = $parent_domain;
...@@ -328,6 +327,8 @@ class page_action extends tform_actions { ...@@ -328,6 +327,8 @@ class page_action extends tform_actions {
if($check && $check['cnt'] > 0) { if($check && $check['cnt'] > 0) {
$app->tform->errorMessage .= $app->tform->lng("web_folder_unique_txt")."<br>"; $app->tform->errorMessage .= $app->tform->lng("web_folder_unique_txt")."<br>";
} }
} else {
$this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
} }
if($_SESSION["s"]["user"]["typ"] != 'admin') { if($_SESSION["s"]["user"]["typ"] != 'admin') {
......
Markdown is supported
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