Commit b3e7785b authored by Marius Burkard's avatar Marius Burkard

Merge branch 'master' into 'stable-3.1'

FS#4070 - DMARC CNAMES cannot be added to ISPConfig



See merge request !271
parents bdb3e805 d63ceade
...@@ -1481,12 +1481,12 @@ class installer_base { ...@@ -1481,12 +1481,12 @@ class installer_base {
//* Create the slave subdirectory //* Create the slave subdirectory
$content .= 'slave'; $content .= 'slave';
if(!@is_dir($content)) mkdir($content, 2770, true); if(!@is_dir($content)) mkdir($content, 02770, true);
//* Chown the slave subdirectory to $conf['bind']['bind_user'] //* Chown the slave subdirectory to $conf['bind']['bind_user']
chown($content, $conf['bind']['bind_user']); chown($content, $conf['bind']['bind_user']);
chgrp($content, $conf['bind']['bind_group']); chgrp($content, $conf['bind']['bind_group']);
chmod($content, 2770); chmod($content, 02770);
} }
...@@ -2822,4 +2822,4 @@ Email Address []: ...@@ -2822,4 +2822,4 @@ Email Address []:
} }
?> ?>
\ No newline at end of file
...@@ -314,6 +314,7 @@ if($_POST['create'] == 1) { ...@@ -314,6 +314,7 @@ if($_POST['create'] == 1) {
$tpl_rows = explode("\n", $tpl_content); $tpl_rows = explode("\n", $tpl_content);
$section = ''; $section = '';
$vars = array(); $vars = array();
$vars['xfer']='';
$dns_rr = array(); $dns_rr = array();
foreach($tpl_rows as $row) { foreach($tpl_rows as $row) {
$row = trim($row); $row = trim($row);
......
...@@ -115,7 +115,7 @@ $form["tabs"]['dns'] = array ( ...@@ -115,7 +115,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'), 'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX', 1 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/', 'regex' => '/^[a-zA-Z0-9\.\-\_]{1,255}$/',
'errmsg'=> 'data_error_regex'), 'errmsg'=> 'data_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -10,4 +10,13 @@ $wb['client_txt'] = 'Πελάτης'; ...@@ -10,4 +10,13 @@ $wb['client_txt'] = 'Πελάτης';
$wb['limit_maildomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των email domains για τον λογαριασμό σας.'; $wb['limit_maildomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των email domains για τον λογαριασμό σας.';
$wb['policy_txt'] = 'Spamfilter'; $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- ανενεργό -'; $wb['no_policy'] = '- ανενεργό -';
$wb["dkim_txt"] = 'enable DKIM';
$wb["dkim_private_txt"] = 'DKIM Private-key';
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
?> ?>
...@@ -10,4 +10,13 @@ $wb['client_txt'] = 'Клиент'; ...@@ -10,4 +10,13 @@ $wb['client_txt'] = 'Клиент';
$wb['limit_maildomain_txt'] = 'Максимальное число почтовых доменов, достигнуто.'; $wb['limit_maildomain_txt'] = 'Максимальное число почтовых доменов, достигнуто.';
$wb['policy_txt'] = 'Спам-фильтр'; $wb['policy_txt'] = 'Спам-фильтр';
$wb['no_policy'] = '- не включено -'; $wb['no_policy'] = '- не включено -';
$wb["dkim_txt"] = 'enable DKIM';
$wb["dkim_private_txt"] = 'DKIM Private-key';
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
?> ?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment