Bugfix: wrong host name when using domain module

mcramer · mcramer · commit 056b11eb05c5 · 2012-09-27T09:32:14.000Z
diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php
@@ -288,7 +288,6 @@ function onSubmit() {
 		$this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"];
 		$this->dataRecord["client_group_id"] = $parent_domain["client_group_id"];
 		$this->dataRecord["vhost_type"] = 'name';
-		$this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
 
 		$this->parent_domain_record = $parent_domain;
         
@@ -328,6 +327,8 @@ function onSubmit() {
             if($check && $check['cnt'] > 0) {
                 $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') {

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,6 @@ function onSubmit() {`
`288`	`288`	`$this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"];`
`289`	`289`	`$this->dataRecord["client_group_id"] = $parent_domain["client_group_id"];`
`290`	`290`	`$this->dataRecord["vhost_type"] = 'name';`
`291`		`- $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];`
`292`	`291`
`293`	`292`	`$this->parent_domain_record = $parent_domain;`
`294`	`293`
`@@ -328,6 +327,8 @@ function onSubmit() {`
`328`	`327`	`if($check && $check['cnt'] > 0) {`
`329`	`328`	`$app->tform->errorMessage .= $app->tform->lng("web_folder_unique_txt")."<br>";`
`330`	`329`	`}`
	`330`	`+ } else {`
	`331`	`+ $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];`
`331`	`332`	`}`
`332`	`333`
`333`	`334`	`if($_SESSION["s"]["user"]["typ"] != 'admin') {`