From 52deb18d9646116114f9649c87ffc4f0bc378db1 Mon Sep 17 00:00:00 2001 From: David Carter Date: Wed, 29 May 2013 07:45:22 +0100 Subject: Add show_actual_foldernames preference and configuration option. When enabled this setting shows actual folder names rather than the localised verions for the four default folders: $rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'sent-mail', 'spam', 'Trash'); --- program/steps/settings/func.inc | 13 +++++++++++++ program/steps/settings/save_prefs.inc | 2 ++ 2 files changed, 15 insertions(+) (limited to 'program/steps/settings') diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index ce86b1cd6..62857ac88 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -770,6 +770,19 @@ function rcmail_user_prefs($current=null) 'main' => array('name' => Q(rcube_label('mainoptions'))), ); + + if (!isset($no_override['show_actual_foldernames'])) { + $field_id = 'show_actual_foldernames'; + $input_show_actual_foldernames = + new html_checkbox(array('name' => '_show_actual_foldernames', + 'id' => $field_id, 'value' => 1)); + + $blocks['main']['options']['show_actul_foldernames'] = array( + 'title' => html::label($field_id, + Q(rcube_label('show_actual_foldernames'))), + 'content' => $input_show_actual_foldernames->show($config['show_actual_foldernames']?1:0), + ); + } // Configure special folders if (!isset($no_override['default_folders'])) { // load folders list only when needed diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index 3bb82aa38..b471489a5 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -119,6 +119,8 @@ switch ($CURR_SECTION) case 'folders': $a_user_prefs = array( + 'show_actual_foldernames' => + isset($_POST['_show_actual_foldernames']) ? TRUE : FALSE, 'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST, true), 'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST, true), 'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST, true), -- cgit v1.2.3