From 08791fea529813a60987010b45533bd307990138 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Wed, 27 Jan 2016 04:55:38 -0500
Subject: [PATCH] Test: Merge branch 'master' into dns-dnssec
---
interface/web/mail/lib/lang/el_mail_domain.lng | 9 +++++++++
interface/web/dns/form/dns_cname.tform.php | 2 +-
install/lib/installer_base.lib.php | 6 +++---
interface/web/dns/dns_wizard.php | 1 +
install/dist/conf/centos70.conf.php | 2 +-
interface/web/mail/lib/lang/ru_mail_domain.lng | 9 +++++++++
6 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/install/dist/conf/centos70.conf.php b/install/dist/conf/centos70.conf.php
index 8aa66ea..a40e88e 100644
--- a/install/dist/conf/centos70.conf.php
+++ b/install/dist/conf/centos70.conf.php
@@ -144,7 +144,7 @@
//* 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
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index c3c59fc..d3b3364 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1502,12 +1502,12 @@
//* 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);
//* Install scripts for dnssec implementation
$this->process_bind_file('named.conf.options', '/etc/bind/', true); //TODO replace hardcoded path
@@ -2845,4 +2845,4 @@
}
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index 1800259..bacadf1 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -314,6 +314,7 @@
$tpl_rows = explode("\n", $tpl_content);
$section = '';
$vars = array();
+ $vars['xfer']='';
$dns_rr = array();
foreach($tpl_rows as $row) {
$row = trim($row);
diff --git a/interface/web/dns/form/dns_cname.tform.php b/interface/web/dns/form/dns_cname.tform.php
index 5fdf8c9..d04c1d0 100644
--- a/interface/web/dns/form/dns_cname.tform.php
+++ b/interface/web/dns/form/dns_cname.tform.php
@@ -115,7 +115,7 @@
'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' => '',
diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng
index 7e825ad..b409734 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['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 d59edee..f67242d 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['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';
?>
--
Gitblit v1.9.1