summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Carter <dpc22@cam.ac.uk>2014-06-06 11:29:40 +0100
committerDavid Carter <dpc22@cam.ac.uk>2014-06-06 11:29:40 +0100
commit4a9a0e1f0fc1977e067806e49b7ce5fa8c47dab5 (patch)
tree4106b5b44a80f4efddbf9c06d64d41ff81d8f717
parenta5fe9a651f487891cda219d6fe7c62917908ab99 (diff)
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.
-rw-r--r--program/include/rcmail.php3
-rw-r--r--program/steps/settings/edit_folder.inc1
2 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 1a227927e..f4689215c 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1325,7 +1325,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 c61ac6da9..30a187fc4 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -135,7 +135,6 @@ function rcmail_folder_form($attrib)
'id' => '_parent',
'name' => '_parent',
'noselection' => '---',
- 'realnames' => false,
'maxlength' => 150,
'unsubscribed' => true,
'skip_noinferiors' => true,