Merge branch '6491-fix-getDomainModuleDomains' into 'develop'

Resolve "Create webdomain form lists domains that are already used"

Closes #6491

See merge request ispconfig/ispconfig3!1715

Author: Till Brehm

interface/lib/classes/tools_sites.inc.php

@@ -145,9 +145,13 @@ function convertClientName($name){
 	}
 
 	/* TODO: rewrite SQL */
-	function getDomainModuleDomains($not_used_in_table = null, $selected_domain = null) {
+	function getDomainModuleDomains($not_used_in_table = null, $selected_domain = '') {
 		global $app;
 
+		// Fix a null value passed in by the create new forms, which lack an id.
+		if ($selected_domain == null) {
+			$selected_domain = '';
+		}
 		$sql = "SELECT domain_id, domain FROM domain WHERE";
 		if ($not_used_in_table) {
 			if (strpos($not_used_in_table, 'dns') !== false) {

interface/web/dns/dns_wizard.php

@@ -196,7 +196,7 @@
 	/*
 	 * The domain-module is in use.
 	*/
-	$domains = $app->tools_sites->getDomainModuleDomains("dns_soa", 'domain');
+	$domains = $app->tools_sites->getDomainModuleDomains("dns_soa");
 	$domain_select = "<option value=''></option>";
 	if(is_array($domains) && sizeof($domains) > 0) {
 		/* We have domains in the list, so create the drop-down-list */

interface/web/sites/web_childdomain_edit.php

@@ -105,7 +105,7 @@ function onShowEnd() {
 			/*
 			 * The domain-module is in use.
 			*/
-			$domains = $app->tools_sites->getDomainModuleDomains($this->_vhostdomain_type == 'subdomain' ? null : "web_domain");
+			$domains = $app->tools_sites->getDomainModuleDomains($this->_vhostdomain_type == 'subdomain' ? null : "web_domain", $this->dataRecord['domain']);
 			$domain_select = "<option value=''></option>";
 			$selected_domain = '';
 			if(is_array($domains) && sizeof($domains) > 0) {

interface/web/sites/web_vhost_domain_edit.php

@@ -694,7 +694,8 @@ function onShowEnd() {
 			/*
 			 * The domain-module is in use.
 			*/
-			$domains = $app->tools_sites->getDomainModuleDomains($this->_vhostdomain_type == 'subdomain' ? null : "web_domain");
+			$domains = $app->tools_sites->getDomainModuleDomains($this->_vhostdomain_type == 'subdomain' ? null : "web_domain", $this->dataRecord['domain']);
+
 			$domain_select = "<option value=''></option>";
 			$selected_domain = '';
 			if(is_array($domains) && sizeof($domains) > 0) {