From daf5a71d75dafb532b442e314d92ea3b7b7b0460 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Sat, 30 May 2015 07:10:41 -0400 Subject: [PATCH] Merge branch 'master' into 'master' --- interface/web/dns/lib/lang/pl_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/en_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/id_dns_dmarc.lng | 2 +- server/plugins-available/postfix_server_plugin.inc.php | 4 ++++ interface/web/dns/lib/lang/fi_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/hr_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/bg_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/ru_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/it_dns_dmarc.lng | 2 +- interface/web/dns/templates/dns_dmarc_edit.htm | 2 +- interface/web/dns/lib/lang/cz_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/ar_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/fr_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/se_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/nl_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/ja_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/pt_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/el_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/ro_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/br_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/hu_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/es_dns_dmarc.lng | 2 +- interface/web/dns/lib/lang/tr_dns_dmarc.lng | 2 +- interface/web/dns/templates/dns_spf_edit.htm | 2 +- interface/web/dns/lib/lang/sk_dns_dmarc.lng | 2 +- 25 files changed, 28 insertions(+), 24 deletions(-) diff --git a/interface/web/dns/lib/lang/ar_dns_dmarc.lng b/interface/web/dns/lib/lang/ar_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/ar_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/ar_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/bg_dns_dmarc.lng b/interface/web/dns/lib/lang/bg_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/bg_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/bg_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/br_dns_dmarc.lng b/interface/web/dns/lib/lang/br_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/br_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/br_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/cz_dns_dmarc.lng b/interface/web/dns/lib/lang/cz_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/cz_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/cz_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/el_dns_dmarc.lng b/interface/web/dns/lib/lang/el_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/el_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/el_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/en_dns_dmarc.lng b/interface/web/dns/lib/lang/en_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/en_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/en_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/es_dns_dmarc.lng b/interface/web/dns/lib/lang/es_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/es_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/es_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/fi_dns_dmarc.lng b/interface/web/dns/lib/lang/fi_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/fi_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/fi_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/fr_dns_dmarc.lng b/interface/web/dns/lib/lang/fr_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/fr_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/fr_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/hr_dns_dmarc.lng b/interface/web/dns/lib/lang/hr_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/hr_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/hr_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/hu_dns_dmarc.lng b/interface/web/dns/lib/lang/hu_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/hu_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/hu_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/id_dns_dmarc.lng b/interface/web/dns/lib/lang/id_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/id_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/id_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/it_dns_dmarc.lng b/interface/web/dns/lib/lang/it_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/it_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/it_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/ja_dns_dmarc.lng b/interface/web/dns/lib/lang/ja_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/ja_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/ja_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/nl_dns_dmarc.lng b/interface/web/dns/lib/lang/nl_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/nl_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/nl_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/pl_dns_dmarc.lng b/interface/web/dns/lib/lang/pl_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/pl_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/pl_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/pt_dns_dmarc.lng b/interface/web/dns/lib/lang/pt_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/pt_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/pt_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/ro_dns_dmarc.lng b/interface/web/dns/lib/lang/ro_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/ro_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/ro_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/ru_dns_dmarc.lng b/interface/web/dns/lib/lang/ru_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/ru_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/ru_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/se_dns_dmarc.lng b/interface/web/dns/lib/lang/se_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/se_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/se_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/sk_dns_dmarc.lng b/interface/web/dns/lib/lang/sk_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/sk_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/sk_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/lib/lang/tr_dns_dmarc.lng b/interface/web/dns/lib/lang/tr_dns_dmarc.lng index 8da5d35..b00949b 100644 --- a/interface/web/dns/lib/lang/tr_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/tr_dns_dmarc.lng @@ -29,7 +29,7 @@ $wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage'; $wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.'; $wb['dmarc_ri_txt'] = 'Reporting Interval'; -$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).'; +$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).'; $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).'; $wb['dmarc_sp_same_txt'] = 'same as domain'; $wb['dmarc_sp_none_txt'] = 'none'; diff --git a/interface/web/dns/templates/dns_dmarc_edit.htm b/interface/web/dns/templates/dns_dmarc_edit.htm index 51116bd..798906a 100644 --- a/interface/web/dns/templates/dns_dmarc_edit.htm +++ b/interface/web/dns/templates/dns_dmarc_edit.htm @@ -146,7 +146,7 @@ <div class="form-group"> <label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label> <div class="col-sm-3"> - <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/> + <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} /> </div> </div> diff --git a/interface/web/dns/templates/dns_spf_edit.htm b/interface/web/dns/templates/dns_spf_edit.htm index bc8c1a2..3c34b37 100644 --- a/interface/web/dns/templates/dns_spf_edit.htm +++ b/interface/web/dns/templates/dns_spf_edit.htm @@ -43,7 +43,7 @@ <div class="form-group"> <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label> <div class="col-sm-9"> - <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/> + <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} /> </div> </div> diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php index e0de304..f6a55f5 100644 --- a/server/plugins-available/postfix_server_plugin.inc.php +++ b/server/plugins-available/postfix_server_plugin.inc.php @@ -139,6 +139,7 @@ } } exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'"); + exec('postfix reload'); } if($mail_config['reject_sender_login_mismatch'] != $old_ini_data['mail']['reject_sender_login_mismatch']) { @@ -157,18 +158,21 @@ array_splice($new_options, $i, 0, array('reject_authenticated_sender_login_mismatch')); } exec("postconf -e 'smtpd_sender_restrictions = ".implode(", ", $new_options)."'"); + exec('postfix reload'); } if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') { // If dovecot switch to lmtp if($app->system->is_installed('dovecot')) { exec("postconf -e 'virtual_transport = lmtp:unix:private/dovecot-lmtp'"); + exec('postfix reload'); } } else { // If dovecot switch to dovecot if($app->system->is_installed('dovecot')) { exec("postconf -e 'virtual_transport = dovecot'"); + exec('postfix reload'); } } -- Gitblit v1.9.1