summaryrefslogtreecommitdiff
path: root/program/steps/settings
diff options
context:
space:
mode:
authorDavid Carter <dpc22@cam.ac.uk>2013-05-29 07:45:22 +0100
committerDavid Carter <dpc22@magenta.csi.cam.ac.uk>2013-05-29 07:51:44 +0100
commit52deb18d9646116114f9649c87ffc4f0bc378db1 (patch)
treea05582ea283cf003378ee7d6081a0f364389fff5 /program/steps/settings
parentb91bc101a0a3c8227b225ce557954f6a1e654ed3 (diff)
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');
Diffstat (limited to 'program/steps/settings')
-rw-r--r--program/steps/settings/func.inc13
-rw-r--r--program/steps/settings/save_prefs.inc2
2 files changed, 15 insertions, 0 deletions
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),