From 94d8fb5a42899377804e42a3084845d034563167 Mon Sep 17 00:00:00 2001 From: David Carter Date: Fri, 6 Jun 2014 11:29:40 +0100 Subject: The following: program/steps/mail/compose.inc :: rcmail_store_target_selection() program/steps/settings/edit_folder.inc :: rcmail_folder_form() both try to localise mailbox names. Push the logic down into the folder_selector() method which can use: $this->config->get('show_real_foldernames') to decide the correct default behaviour. Clients functions and methods can still override by adding 'realnames' named parameter to the folder_selector() call. The obvious example is the Settings -> Preferences -> Special Folders screen. --- program/include/rcmail.php | 3 ++- program/steps/settings/edit_folder.inc | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'program') diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 2f595deef..350b54fb9 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1342,7 +1342,8 @@ class rcmail extends rcube */ public function folder_selector($p = array()) { - $p += array('maxlength' => 100, 'realnames' => false, 'is_escaped' => true); + $realnames = $this->config->get('show_real_foldernames'); + $p += array('maxlength' => 100, 'realnames' => $realnames, 'is_escaped' => true); $a_mailboxes = array(); $storage = $this->get_storage(); diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc index 8ac51658c..5b37698d1 100644 --- a/program/steps/settings/edit_folder.inc +++ b/program/steps/settings/edit_folder.inc @@ -134,7 +134,6 @@ function rcmail_folder_form($attrib) $select = $RCMAIL->folder_selector(array( 'name' => '_parent', 'noselection' => '---', - 'realnames' => false, 'maxlength' => 150, 'unsubscribed' => true, 'skip_noinferiors' => true, -- cgit v1.2.3