Merge branch 'empty-first-option' into 'stable-3.1'

Add empty option for domain module dropdown

See merge request ispconfig/ispconfig3!1022

Author: Till Brehm

interface/web/dns/dns_slave_edit.php

@@ -124,7 +124,7 @@ function onShowEnd() {
 			 * The domain-module is in use.
 			*/
 			$domains = $app->tools_sites->getDomainModuleDomains("dns_slave", $this->dataRecord["origin"]);
-			$domain_select = '';
+			$domain_select = "<option value=''></option>";
 			if(is_array($domains) && sizeof($domains) > 0) {
 				/* We have domains in the list, so create the drop-down-list */
 				foreach( $domains as $domain) {

interface/web/dns/dns_soa_edit.php

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

interface/web/dns/dns_wizard.php

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

interface/web/mail/mail_domain_catchall_edit.php

@@ -77,7 +77,7 @@ function onShowEnd() {
 		// Getting Domains of the user
 		$sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r');
 		$domains = $app->db->queryAllRecords($sql);
-		$domain_select = '';
+		$domain_select = "<option value=''></option>";
 		if(is_array($domains)) {
 			foreach( $domains as $domain) {
 				$domain['domain'] = $app->functions->idn_decode($domain['domain']);

interface/web/mail/mail_domain_edit.php

@@ -159,7 +159,7 @@ function onShowEnd() {
 			 * The domain-module is in use.
 			*/
 			$domains = $app->tools_sites->getDomainModuleDomains("mail_domain", $this->dataRecord["domain"]);
-			$domain_select = '';
+			$domain_select = "<option value=''></option>";
 			if(is_array($domains) && sizeof($domains) > 0) {
 				/* We have domains in the list, so create the drop-down-list */
 				foreach( $domains as $domain) {

interface/web/mail/mail_mailinglist_edit.php

@@ -112,7 +112,7 @@ function onShowEnd() {
 		// Getting Domains of the user
 		$sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
 		$domains = $app->db->queryAllRecords($sql);
-		$domain_select = '';
+		$domain_select = "<option value=''></option>";
 		if(is_array($domains)) {
 			foreach( $domains as $domain) {
 				$selected = ($domain["domain"] == $this->dataRecord["domain"])?'SELECTED':'';

interface/web/mail/xmpp_domain_edit.php

@@ -182,7 +182,7 @@ function onShowEnd() {
 			 * The domain-module is in use.
 			*/
 			$domains = $app->tools_sites->getDomainModuleDomains("xmpp_domain", $this->dataRecord["domain"]);
-			$domain_select = '';
+			$domain_select = "<option value=''></option>";
 			if(is_array($domains) && sizeof($domains) > 0) {
 				/* We have domains in the list, so create the drop-down-list */
 				foreach( $domains as $domain) {

interface/web/sites/lib/lang/nl_web_domain.lng

@@ -89,8 +89,8 @@ $wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive
 $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
 $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
 $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
-$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
-$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is ongeldig.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is ongeldig.';
 $wb['ssl_key_txt'] = 'SSL Key';
 $wb['perl_txt'] = 'Perl';
 $wb['fastcgi_php_version_txt'] = 'PHP Versie';

interface/web/sites/web_childdomain_edit.php

@@ -106,7 +106,7 @@ function onShowEnd() {
 			 * The domain-module is in use.
 			*/
 			$domains = $app->tools_sites->getDomainModuleDomains($this->_vhostdomain_type == 'subdomain' ? null : "web_domain");
-			$domain_select = '';
+			$domain_select = "<option value=''></option>";
 			$selected_domain = '';
 			if(is_array($domains) && sizeof($domains) > 0) {
 				/* We have domains in the list, so create the drop-down-list */