Merge branch 'stable-3.1' into 'stable-3.1'

Stable 3.1



See merge request !535

Author: Till Brehm

install/lib/installer_base.lib.php

@@ -2340,6 +2340,12 @@ public function install_ispconfig() {
 		//* chown the interface files to the ispconfig user and group
 		$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
 		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+
+		//* Chmod the files and directories in the acme dir with nginx installed
+		if($conf['nginx']['installed'] == true) {
+			$command = 'chmod -R 755 '.$install_dir.'/interface/acme';
+			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+		}
 
 		//* chown the server files to the root user and group
 		$command = 'chown -R root:root '.$install_dir.'/server';

interface/web/admin/form/server_php.tform.php

@@ -89,7 +89,7 @@
 			'formtype' => 'SELECT',
 			'default' => '',
 			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
+				'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name',
 				'keyfield'=> 'server_id',
 				'valuefield'=> 'server_name'
 			),

interface/web/dns/dns_wizard.php

@@ -421,6 +421,7 @@
 			"dnssec_wanted" => $enable_dnssec
 		);
 		$dns_soa_id = $app->db->datalogInsert('dns_soa', $insert_data, 'id');
+		if($dns_soa_id > 0) $app->plugin->raiseEvent('dns:wizard:on_after_insert', $dns_soa_id);
 
 		// Insert the dns_rr records
 		if(is_array($dns_rr) && $dns_soa_id > 0) {

interface/web/dns/form/dns_slave.tform.php

@@ -108,10 +108,16 @@
 		'ns' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
+/*
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
 					'regex' => '/^[0-9\.]{1,255}$/',
 					'errmsg'=> 'ns_error_regex'),
 			),
+*/
+			'validators' => array (  0 => array ( 'type' => 'ISIP',
+					'separator' => ',',
+					'errmsg'=> 'ns_error_regex'),
+			),
 			'default' => '',
 			'value'  => '',
 			'width'  => '30',

interface/web/dns/lib/lang/ar_dns_slave.lng

@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>

interface/web/dns/lib/lang/bg_dns_slave.lng

@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Вече има запис за тази зона.
 $wb['origin_error_regex'] = 'Името на зоната е в грешен формат.';
 $wb['ns_error_regex'] = 'NS е в грешен формат.';
 $wb['eg_domain_tld'] = 'примерно domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 формата изглейда така: 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>

interface/web/dns/lib/lang/br_dns_slave.lng

@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Já existe um registro igual para esta zona.';
 $wb['origin_error_regex'] = 'Zona inválida.';
 $wb['ns_error_regex'] = 'Registro NS inválido.';
 $wb['eg_domain_tld'] = 'ex.: dominio.com.';
-$wb['ipv4_form_txt'] = 'Formato IPv4 - ex.: 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Zona dns secundária';
 ?>

interface/web/dns/lib/lang/ca_dns_slave.lng

@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Il y a déjà un enregistrement pour cette zone.';
 $wb['origin_error_regex'] = 'Le format de la zone est invalide.';
 $wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.';
 $wb['eg_domain_tld'] = 'ex. domain.tld.';
-$wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Zone DNS secondaire';
 ?>

interface/web/dns/lib/lang/cz_dns_slave.lng

@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Pro tuto zónu již existuje záznam.';
 $wb['origin_error_regex'] = 'Zóna má neplatný formát.';
 $wb['ns_error_regex'] = 'NS má neplatný formát.';
 $wb['eg_domain_tld'] = 'např. domena.cz';
-$wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Sekundární DNS zóna';
 ?>

interface/web/dns/lib/lang/de_dns_slave.lng

@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Es existiert bereits ein Eintrag für diese Zone.'
 $wb['origin_error_regex'] = 'Zone hat ein ungültiges Format.';
 $wb['ns_error_regex'] = 'NS hat ein ungültiges Format.';
 $wb['eg_domain_tld'] = 'Format: domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 Format: 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 ?>