Skip to content

Commit 7010250

Browse files
author
Thom Pol
committed
Add function to disable per domain relaying globally (#6088)
1 parent 86f8f38 commit 7010250

30 files changed

+51
-9
lines changed

install/tpl/system.ini.master

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
[mail]
1010
enable_custom_login=n
11+
show_per_domain_relay_options=n
1112
mailbox_show_autoresponder_tab=y
1213
mailbox_show_mail_filter_tab=y
1314
mailbox_show_custom_rules_tab=y

interface/web/admin/form/system_config.tform.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,12 @@
267267
'default' => 'n',
268268
'value' => array(0 => 'n', 1 => 'y')
269269
),
270+
'show_per_domain_relay_options' => array(
271+
'datatype' => 'VARCHAR',
272+
'formtype' => 'CHECKBOX',
273+
'default' => 'n',
274+
'value' => array(0 => 'n', 1 => 'y')
275+
),
270276
'mailbox_show_autoresponder_tab' => array (
271277
'datatype' => 'VARCHAR',
272278
'formtype' => 'CHECKBOX',

interface/web/admin/lib/lang/ar_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
5151
$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
5252
$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
5353
$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
54+
$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
5455
$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
5556
$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
5657
$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';

interface/web/admin/lib/lang/bg_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
5151
$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
5252
$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
5353
$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
54+
$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
5455
$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
5556
$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
5657
$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';

interface/web/admin/lib/lang/br_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ $wb['webdavuser_prefix_error_regex'] = 'Caractere não permitido para o prefixo
2626
$wb['dblist_phpmyadmin_link_txt'] = 'Link para o PHPMyAdmin';
2727
$wb['enable_custom_login_txt'] = 'Permitir nome de usuário personalizado';
2828
$wb['mailboxlist_webmail_link_txt'] = 'Link para o Webmail';
29+
$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
2930
$wb['mailbox_show_autoresponder_tab_txt'] = 'Exibir aba de auto-resposta nos detalhes da conta de email';
3031
$wb['mailbox_show_mail_filter_tab_txt'] = 'Exibir aba de filtro de emails nos detalhes da conta de email';
3132
$wb['mailbox_show_custom_rules_tab_txt'] = 'Exibir aba de filtros personalizados de email nos detalhes da conta de email';

interface/web/admin/lib/lang/ca_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ $wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.'
2626
$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
2727
$wb['enable_custom_login_txt'] = 'Allow custom login name';
2828
$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
29+
$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
2930
$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
3031
$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
3132
$wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';

interface/web/admin/lib/lang/cz_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ $wb['use_combobox_txt'] = 'Použití jQuery UI Combobox';
4848
$wb['use_loadindicator_txt'] = 'Použití indikátoru zatížení';
4949
$wb['f5_to_reload_js_txt'] = 'Pokud vypnete tuto volbu, zřejmě budete muset používat klávesu F5, aby internetový prohlížeč znovu načetl JavaScript knihovny nebo budete muset ručně vyprázdňovat mezipaměť (cache) vašeho internetového prohlížeče.';
5050
$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
51+
$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
5152
$wb['mailbox_show_autoresponder_tab_txt'] = 'Ukázat kartu automatická odpověď v podrobnostech u poštovní schránky';
5253
$wb['mailbox_show_mail_filter_tab_txt'] = 'Ukázat kartu poštovní filtry v podrobnostech u poštovní schránky';
5354
$wb['mailbox_show_custom_rules_tab_txt'] = 'Ukázat kartu vlastní pravidla v podrobnostech u poštovní schránky';

interface/web/admin/lib/lang/de_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ $wb['f5_to_reload_js_txt'] = 'Wenn Sie den Wert ändern, müssen Sie F5 drücken
5151
$wb['phpmyadmin_url_error_regex'] = 'Falsche phpMyAdmin URL';
5252
$wb['client_username_web_check_disabled_txt'] = 'Deaktiviere die Kunden Benutzernamen Überprüfung für den Begriff <b>web<b>.';
5353
$wb['backups_include_into_web_quota_txt'] = 'Backups in Web Quota hinzuzählen.';
54+
$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
5455
$wb['mailbox_show_autoresponder_tab_txt'] = 'Zeige Autoresponder Reiter in E-Mail Kontodetails';
5556
$wb['mailbox_show_mail_filter_tab_txt'] = 'Zeige E-Mail Filter Reiter in E-Mail Kontodetails';
5657
$wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';

interface/web/admin/lib/lang/dk_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ $wb['use_combobox_txt'] = 'Brug jQuery UI Combobox';
4848
$wb['use_loadindicator_txt'] = 'Brug Load Indicator';
4949
$wb['f5_to_reload_js_txt'] = 'Hvis du ændrer dette, kan du blive nødt til at trykke på F5 for at browseren genindlæser JavaScript-biblioteker eller tømme browserens cache.';
5050
$wb['client_username_web_check_disabled_txt'] = 'Deaktiver klient-brugernavns check for ordet \'web\'.';
51+
$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
5152
$wb['mailbox_show_autoresponder_tab_txt'] = 'Vis autoresponder tab i mail kontooplysninger';
5253
$wb['mailbox_show_mail_filter_tab_txt'] = 'Vis mail filter tab i mail kontooplysninger';
5354
$wb['mailbox_show_custom_rules_tab_txt'] = 'Vis custom mailfilter tab i mail kontooplysninger';

interface/web/admin/lib/lang/el_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ $wb['use_loadindicator_txt'] = 'Χρήση Load Indicator (ενδεικτή φό
5151
$wb['f5_to_reload_js_txt'] = 'Αν το αλλάξετε, ίσως πρέπει να πατήσετε το F5 για να κάνετε τον φυλλομετρητη να ξαναφορτώσει τις βιβλιοθήκες JavaScript ή να αδείασετε την cache του φυλλομετρητή.';
5252
$wb['client_username_web_check_disabled_txt'] = 'Απενεργοποίηση ελέγχου στο όνομα χρήστη για την λέξη \'web\'.';
5353
$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
54+
$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
5455
$wb['mailbox_show_autoresponder_tab_txt'] = 'Εμφάνιση της καρτέλας Αυτόματης Απάντησης στις λεπτομέρειες του λογαριασμού mail';
5556
$wb['mailbox_show_mail_filter_tab_txt'] = 'Εμφάνιση της καρτέλας Φίλτρα mail στις λεπτομέρειες του λογαριασμού mail';
5657
$wb['mailbox_show_custom_rules_tab_txt'] = 'Εμφάνιση της καρτέλας Προσαρμοσμένοι Κανόνες στις λεπτομέρειες του λογαριασμού mail';

0 commit comments

Comments
 (0)