Fixed: #4059 can't edit existing subdomain

Till Brehm · Till Brehm · commit c4aba1aeacb3 · 2016-07-28T11:51:31.000+02:00
diff --git a/interface/lib/classes/tools_sites.inc.php b/interface/lib/classes/tools_sites.inc.php
@@ -157,7 +157,7 @@ function getDomainModuleDomains($not_used_in_table = null, $selected_domain = nu
 				$field = "domain";
 				$select = $field;
 			}
-			$sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field != ?) AND";
+			$sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field = ?) AND";
 		}
 		if ($_SESSION["s"]["user"]["typ"] == 'admin') {
 			$sql .= " 1";
diff --git a/interface/web/sites/web_childdomain_edit.php b/interface/web/sites/web_childdomain_edit.php
@@ -131,8 +131,10 @@ function onShowEnd() {
 			}
 			$app->tpl->setVar("domain_option", $domain_select);
 			if($this->_childdomain_type == 'subdomain') {
-				$this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);
+				//$this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);
+				$this->dataRecord["domain"] = str_replace('.'.$selected_domain, '', $this->dataRecord["domain"]);
 			}
+			
 		} else {
 			if($this->_childdomain_type == 'subdomain') {
 				// Get the record of the parent domain

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ function getDomainModuleDomains($not_used_in_table = null, $selected_domain = nu`
`157`	`157`	`$field = "domain";`
`158`	`158`	`$select = $field;`
`159`	`159`	`}`
`160`		`- $sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field != ?) AND";`
	`160`	`+ $sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field = ?) AND";`
`161`	`161`	`}`
`162`	`162`	`if ($_SESSION["s"]["user"]["typ"] == 'admin') {`
`163`	`163`	`$sql .= " 1";`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,10 @@ function onShowEnd() {`
`131`	`131`	`}`
`132`	`132`	`$app->tpl->setVar("domain_option", $domain_select);`
`133`	`133`	`if($this->_childdomain_type == 'subdomain') {`
`134`		`- $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);`
	`134`	`+ //$this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1);`
	`135`	`+ $this->dataRecord["domain"] = str_replace('.'.$selected_domain, '', $this->dataRecord["domain"]);`
`135`	`136`	`}`
	`137`	`+`
`136`	`138`	`} else {`
`137`	`139`	`if($this->_childdomain_type == 'subdomain') {`
`138`	`140`	`// Get the record of the parent domain`