From 6f8a85a6d8047ca0e18626f5eba90c7807a103a7 Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Fri, 22 Jan 2016 08:25:44 +0100 Subject: [PATCH 1/5] FS#4070 - DMARC CNAMES cannot be added to ISPConfig --- interface/web/dns/form/dns_cname.tform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/dns/form/dns_cname.tform.php b/interface/web/dns/form/dns_cname.tform.php index 5fdf8c9b4..d04c1d01a 100644 --- a/interface/web/dns/form/dns_cname.tform.php +++ b/interface/web/dns/form/dns_cname.tform.php @@ -115,7 +115,7 @@ $form["tabs"]['dns'] = array ( 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/', + 'regex' => '/^[a-zA-Z0-9\.\-\_]{1,255}$/', 'errmsg'=> 'data_error_regex'), ), 'default' => '', -- GitLab From f6640427d7957f05d8d8d5c824469adb80715b8b Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Fri, 22 Jan 2016 09:42:30 +0100 Subject: [PATCH 2/5] fixed permissions for bind-slave. (Dr. Ralf Schlatterbeck - Open Source Consulting) --- install/lib/installer_base.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index f22a627da..69d5ccfd9 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1481,12 +1481,12 @@ class installer_base { //* Create the slave subdirectory $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($content, $conf['bind']['bind_user']); chgrp($content, $conf['bind']['bind_group']); - chmod($content, 2770); + chmod($content, 02770); } @@ -2822,4 +2822,4 @@ Email Address []: } -?> \ No newline at end of file +?> -- GitLab From 9db5aaea216d65440313c17de1a3c395ed758328 Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Sat, 23 Jan 2016 19:47:53 +0100 Subject: [PATCH 3/5] add missing lng-entries --- interface/web/mail/lib/lang/el_mail_domain.lng | 9 +++++++++ interface/web/mail/lib/lang/ru_mail_domain.lng | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng index 7e825ad4b..b40973438 100644 --- a/interface/web/mail/lib/lang/el_mail_domain.lng +++ b/interface/web/mail/lib/lang/el_mail_domain.lng @@ -10,4 +10,13 @@ $wb['client_txt'] = 'Πελάτης'; $wb['limit_maildomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των email domains για τον λογαριασμό σας.'; $wb['policy_txt'] = 'Spamfilter'; $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'; ?> diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng index d59edeec5..f67242d6e 100644 --- a/interface/web/mail/lib/lang/ru_mail_domain.lng +++ b/interface/web/mail/lib/lang/ru_mail_domain.lng @@ -10,4 +10,13 @@ $wb['client_txt'] = 'Клиент'; $wb['limit_maildomain_txt'] = 'Максимальное число почтовых доменов, достигнуто.'; $wb['policy_txt'] = 'Спам-фильтр'; $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'; ?> -- GitLab From d63ceade2147e2e89b34f603c80def6eb4aaabeb Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Tue, 26 Jan 2016 09:02:21 +0100 Subject: [PATCH 4/5] FS#3973 - dns-wizard --- interface/web/dns/dns_wizard.php | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php index 18002593d..bacadf19c 100644 --- a/interface/web/dns/dns_wizard.php +++ b/interface/web/dns/dns_wizard.php @@ -314,6 +314,7 @@ if($_POST['create'] == 1) { $tpl_rows = explode("\n", $tpl_content); $section = ''; $vars = array(); + $vars['xfer']=''; $dns_rr = array(); foreach($tpl_rows as $row) { $row = trim($row); -- GitLab From 7927f098815a0ec4e232914d01626ae8de99383d Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Tue, 26 Jan 2016 13:16:56 +0100 Subject: [PATCH 5/5] FS#4072 - Centos 7 Amavisd config path --- install/dist/conf/centos70.conf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/dist/conf/centos70.conf.php b/install/dist/conf/centos70.conf.php index 8aa66ea03..a40e88ed7 100644 --- a/install/dist/conf/centos70.conf.php +++ b/install/dist/conf/centos70.conf.php @@ -144,7 +144,7 @@ $conf['saslauthd']['init_script'] = 'saslauthd'; //* Amavisd $conf['amavis']['installed'] = false; // will be detected automatically during installation -$conf['amavis']['config_dir'] = '/etc'; +$conf['amavis']['config_dir'] = '/etc/amavisd'; $conf['amavis']['init_script'] = 'amavisd'; //* ClamAV -- GitLab