Merge branch 'stable-3.1' into 'master'

Stable 3.1

Add checkbox to main config for show/hide backup tab in mail account details.

See merge request !451

Author: Till Brehm

install/tpl/system.ini.master

@@ -11,6 +11,7 @@ enable_custom_login=n
 mailbox_show_autoresponder_tab=y
 mailbox_show_mail_filter_tab=y
 mailbox_show_custom_rules_tab=y
+mailbox_show_backup_tab=y
 mailboxlist_webmail_link=y
 webmail_url=/webmail
 dkim_path=/var/lib/amavis/dkim

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

@@ -238,6 +238,12 @@
 			'default'  => 'y',
 			'value'    => array(0 => 'n', 1 => 'y')
 		),
+        'mailbox_show_backup_tab' => array (
+                'datatype' => 'VARCHAR',
+                'formtype' => 'CHECKBOX',
+                'default'  => 'y',
+                'value'    => array(0 => 'n', 1 => 'y')
+        ),
 		'mailboxlist_webmail_link' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

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

@@ -52,6 +52,7 @@ $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
+$wb['mailbox_show_backup_tab_txt'] = 'Show backup tab in mail account details';
 $wb['webmail_url_error_regex'] = 'Invalid webmail URL';
 $wb['phpmyadmin_url_note_txt'] = 'Placeholder:';
 $wb['webmail_url_note_txt'] = 'Placeholder:';

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

@@ -52,6 +52,7 @@ $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
+$wb['mailbox_show_backup_tab_txt'] = 'Show backup tab in mail account details';
 $wb['webmail_url_error_regex'] = 'Invalid webmail URL';
 $wb['phpmyadmin_url_note_txt'] = 'Placeholder:';
 $wb['webmail_url_note_txt'] = 'Placeholder:';

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

@@ -52,6 +52,7 @@ $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
+$wb['mailbox_show_backup_tab_txt'] = 'Show backup tab in mail account details';
 $wb['webmail_url_error_regex'] = 'Invalid webmail URL';
 $wb['phpmyadmin_url_note_txt'] = 'Placeholder:';
 $wb['webmail_url_note_txt'] = 'Placeholder:';

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

@@ -28,6 +28,7 @@ $wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
+$wb['mailbox_show_backup_tab_txt'] = 'Show backup tab in mail account details';
 $wb['webmail_url_txt'] = 'Webmail URL';
 $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
 $wb['mailmailinglist_url_txt'] = 'Mailing list URL';

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

@@ -49,6 +49,7 @@ $wb['client_username_web_check_disabled_txt'] = 'Disable client username check f
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Ukázat kartu automatická odpověď v podrobnostech u e-mailové schránky';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Ukázat kartu e-mailové filtry v podrobnostech u e-mailové schránky';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Ukázat kartu vlastní pravidla v podrobnostech u e-mailové schránky';
+$wb['mailbox_show_backup_tab_txt'] = 'Show backup tab in mail account details';
 $wb['webmail_url_error_regex'] = 'Neplatný webmail URL';
 $wb['phpmyadmin_url_note_txt'] = 'Zástupný symbol';
 $wb['webmail_url_note_txt'] = 'Zástupný symbol';

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

@@ -52,6 +52,7 @@ $wb['backups_include_into_web_quota_txt'] = 'Backups in Web Quota hinzuzählen.'
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Zeige Autoresponder Reiter in E-Mail Kontodetails';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Zeige E-Mail Filter Reiter in E-Mail Kontodetails';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';
+$wb['mailbox_show_backup_tab_txt'] = 'Show backup tab in mail account details';
 $wb['webmail_url_error_regex'] = 'Falsche Webmail URL';
 $wb['reseller_can_use_options_txt'] = 'Reseller können den Optionen Reiter bei Webseiten verwenden';
 $wb['phpmyadmin_url_note_txt'] = 'Platzhalter:';

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

@@ -49,6 +49,7 @@ $wb['client_username_web_check_disabled_txt'] = 'Deaktiver klient-brugernavns ch
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Vis autoresponder tab i mail kontooplysninger';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Vis mail filter tab i mail kontooplysninger';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Vis custom mailfilter tab i mail kontooplysninger';
+$wb['mailbox_show_backup_tab_txt'] = 'Show backup tab in mail account details';
 $wb['webmail_url_error_regex'] = 'Ugyldigt webmail URL';
 $wb['phpmyadmin_url_note_txt'] = 'Pladsholder:';
 $wb['webmail_url_note_txt'] = 'Pladsholder:';

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

@@ -52,6 +52,7 @@ $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Εμφάνιση της καρτέλας Αυτόματης Απάντησης στις λεπτομέρειες του λογαριασμού mail';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Εμφάνιση της καρτέλας Φίλτρα mail στις λεπτομέρειες του λογαριασμού mail';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Εμφάνιση της καρτέλας Προσαρμοσμένοι Κανόνες στις λεπτομέρειες του λογαριασμού mail';
+$wb['mailbox_show_backup_tab_txt'] = 'Show backup tab in mail account details';
 $wb['webmail_url_error_regex'] = 'Invalid webmail URL';
 $wb['phpmyadmin_url_note_txt'] = 'Placeholder:';
 $wb['webmail_url_note_txt'] = 'Placeholder:';