From bed72531bfb1ca225bb2c009dfbacf8f09fcd128 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 07 Mar 2014 03:48:26 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/sites/lib/lang/id_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/ru_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/bg_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/it_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/sk_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/cz_database_quota_stats_list.lng | 7 ++
server/plugins-available/postfix_server_plugin.inc.php | 12 +++
interface/web/dns/form/dns_template.tform.php | 2
interface/web/sites/lib/lang/el_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/de_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/ro_database_quota_stats_list.lng | 7 ++
interface/web/dns/dns_wizard.php | 4
interface/web/sites/lib/lang/nl_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/fr_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/fi_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/br_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/hr_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/ar_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/ja_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/tr_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/es_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/hu_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/pt_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/pl_database_quota_stats_list.lng | 7 ++
interface/web/sites/lib/lang/se_database_quota_stats_list.lng | 7 ++
25 files changed, 168 insertions(+), 4 deletions(-)
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index 33f468e..844686e 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -245,10 +245,10 @@
if($_POST['ns2'] != '') $tpl_content = str_replace('{NS2}', $_POST['ns2'], $tpl_content);
if($_POST['email'] != '') $tpl_content = str_replace('{EMAIL}', $_POST['email'], $tpl_content);
if(isset($_POST['dkim']) && preg_match('/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/', $_POST['domain'])) {
- $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = '".$app->db->quote($_POST['domain'])."' AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'));
+ $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']);
if ($public_key!='') {
$dns_record=str_replace(array("\r\n", "\n", "\r", "-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----"), '', $public_key['dkim_public']);
- $tpl_content = str_replace('TXT|'.$_POST['domain'].'|{DKIM}', 'TXT|default._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record, $tpl_content);
+ $tpl_content .= "\n".'TXT|default._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record;
}
}
diff --git a/interface/web/dns/form/dns_template.tform.php b/interface/web/dns/form/dns_template.tform.php
index 5031e56..8c2b175 100644
--- a/interface/web/dns/form/dns_template.tform.php
+++ b/interface/web/dns/form/dns_template.tform.php
@@ -74,7 +74,7 @@
'formtype' => 'CHECKBOXARRAY',
'default' => '',
'separator' => ',',
- 'value' => array('DOMAIN' => 'Domain', 'IP' => 'IP Address', 'IPV6' => 'IPv6 Address', 'NS1' => 'NS 1', 'NS2' => 'NS 2', 'EMAIL' => 'Email', 'DKIM' => 'DKIM (use TXT|{DOMAIN}.|{DKIM} in your Template)'),
+ 'value' => array('DOMAIN' => 'Domain', 'IP' => 'IP Address', 'IPV6' => 'IPv6 Address', 'NS1' => 'NS 1', 'NS2' => 'NS 2', 'EMAIL' => 'Email', 'DKIM' => 'DKIM'),
'validators' => array ( 0 => array ('type' => 'CUSTOM',
'class' => 'validate_dkim',
'function' => 'check_template',
diff --git a/interface/web/sites/lib/lang/ar_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ar_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/bg_database_quota_stats_list.lng b/interface/web/sites/lib/lang/bg_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/br_database_quota_stats_list.lng b/interface/web/sites/lib/lang/br_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/cz_database_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/de_database_quota_stats_list.lng b/interface/web/sites/lib/lang/de_database_quota_stats_list.lng
new file mode 100644
index 0000000..5c7f6be
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Datenbank';
+$wb["client_txt"] = 'Kunde';
+$wb["used_txt"] = 'Verwendeter Speicherplatz';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Verbraucht in %';
+?>
diff --git a/interface/web/sites/lib/lang/el_database_quota_stats_list.lng b/interface/web/sites/lib/lang/el_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/es_database_quota_stats_list.lng b/interface/web/sites/lib/lang/es_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/fi_database_quota_stats_list.lng b/interface/web/sites/lib/lang/fi_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/fr_database_quota_stats_list.lng b/interface/web/sites/lib/lang/fr_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/hr_database_quota_stats_list.lng b/interface/web/sites/lib/lang/hr_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/hu_database_quota_stats_list.lng b/interface/web/sites/lib/lang/hu_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/id_database_quota_stats_list.lng b/interface/web/sites/lib/lang/id_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/it_database_quota_stats_list.lng b/interface/web/sites/lib/lang/it_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/ja_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ja_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/nl_database_quota_stats_list.lng b/interface/web/sites/lib/lang/nl_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/pl_database_quota_stats_list.lng b/interface/web/sites/lib/lang/pl_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/pt_database_quota_stats_list.lng b/interface/web/sites/lib/lang/pt_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/ro_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ro_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/ru_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ru_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/se_database_quota_stats_list.lng b/interface/web/sites/lib/lang/se_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/sk_database_quota_stats_list.lng b/interface/web/sites/lib/lang/sk_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/tr_database_quota_stats_list.lng b/interface/web/sites/lib/lang/tr_database_quota_stats_list.lng
new file mode 100644
index 0000000..1276a25
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_database_quota_stats_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["database_txt"] = 'Database';
+$wb["client_txt"] = 'Client';
+$wb["used_txt"] = 'Used space';
+$wb["quota_txt"] = 'Quota';
+$wb["percentage_txt"] = 'Used in %';
+?>
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index ad92dec..fd9fd5a 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -109,6 +109,7 @@
}
if($mail_config['realtime_blackhole_list'] != $old_ini_data['mail']['realtime_blackhole_list']) {
+ $rbl_updated = false;
$rbl_hosts = trim(preg_replace('/\s+/', '', $mail_config['realtime_blackhole_list']));
if($rbl_hosts != ''){
$rbl_hosts = explode(",", $rbl_hosts);
@@ -117,9 +118,18 @@
foreach ($options as $key => $value) {
if (!preg_match('/reject_rbl_client/', $value)) {
$new_options[] = $value;
+ } else {
+ if(is_array($rbl_hosts) && !empty($rbl_hosts) && !$rbl_updated){
+ $rbl_updated = true;
+ foreach ($rbl_hosts as $key => $value) {
+ $value = trim($value);
+ if($value != '') $new_options[] = "reject_rbl_client ".$value;
+ }
+ }
}
}
- if(is_array($rbl_hosts) && !empty($rbl_hosts)){
+ //* first time add rbl-list
+ if (!$rbl_updated && is_array($rbl_hosts) && !empty($rbl_hosts)) {
foreach ($rbl_hosts as $key => $value) {
$value = trim($value);
if($value != '') $new_options[] = "reject_rbl_client ".$value;
--
Gitblit v1.9.1