Merge pull request #77 from dpc22/realnames

Add show_real_foldernames preference and configuration option.

1 files changed, 7 insertions, 2 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 0cb4aad15..17c95d7ed 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1326,6 +1326,9 @@ class rcmail extends rcube
         $msgcounts = $this->storage->get_cache('messagecount');
         $collapsed = $this->config->get('collapsed_folders');
 
+        if ($this->config->get('show_real_foldernames'))
+            $realnames = true;
+
         $out = '';
         foreach ($arrFolders as $folder) {
             $title        = null;
@@ -1491,7 +1494,8 @@ class rcmail extends rcube
             if ($count > 1) {
                 for ($i = 0; $i < $count; $i++) {
                     $folder = implode($delimiter, array_slice($path, 0, -$i));
-                    if ($folder_class = $this->folder_classname($folder)) {
+                    if (!$this->config->get('show_real_foldernames') &&
+                        ($folder_class = $this->folder_classname($folder))) {
                         $name = implode($delimiter, array_slice($path, $count - $i));
                         return $this->gettext($folder_class) . $delimiter . rcube_charset::convert($name, 'UTF7-IMAP');
                     }
@@ -1499,7 +1503,8 @@ class rcmail extends rcube
             }
         }
 
-        if ($folder_class = $this->folder_classname($name)) {
+        if (!$this->config->get('show_real_foldernames') &&
+            ($folder_class = $this->folder_classname($name))) {
             return $this->gettext($folder_class);
         }
         else {