From 0f708c1abd837f017ec35b82c039ef4118df42d9 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 29 Dec 2008 13:08:28 -0700 Subject: [PATCH] Request #7759 - Show translated INBOX prefix. --- imp/docs/CHANGES | 1 + imp/lib/IMP.php | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES index 20766c748..d2c9dd31c 100644 --- a/imp/docs/CHANGES +++ b/imp/docs/CHANGES @@ -43,6 +43,7 @@ v5.0-cvs v4.3.3-cvs ---------- +[mms] Show translated 'INBOX' prefix for subfolders (Request #7759). [mms] Workaround obsolete 'UT' date format (Request #5717). [mms] Fix tracking folder changes when renaming (Bug #7772). [cjh] Suppress browser autocomplete when redirecting messages (Bug #7767). diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php index bf97cb904..e1c1ab4a5 100644 --- a/imp/lib/IMP.php +++ b/imp/lib/IMP.php @@ -477,7 +477,7 @@ class IMP */ static public function displayFolder($folder) { - $cache = self::$_displaycache; + $cache = &self::$_displaycache; if (isset($cache[$folder])) { return $cache[$folder]; @@ -486,12 +486,15 @@ class IMP if ($folder == 'INBOX') { $cache[$folder] = _("Inbox"); } else { - $namespace_info = $GLOBALS['imp_imap']->getNamespace($folder); - if (!is_null($namespace_info) && - !empty($namespace_info['name']) && - ($namespace_info['type'] == 'personal') && - substr($folder, 0, strlen($namespace_info['name'])) == $namespace_info['name']) { - $cache[$folder] = substr($folder, strlen($namespace_info['name'])); + $ns_info = $GLOBALS['imp_imap']->getNamespace($folder); + if (!is_null($ns_info) && + !empty($ns_info['name']) && + ($ns_info['type'] == 'personal') && + substr($folder, 0, strlen($ns_info['name'])) == $ns_info['name']) { + $cache[$folder] = substr($folder, strlen($ns_info['name'])); + } elseif (!is_null($ns_info) && + (stripos($folder, 'INBOX' . $ns_info['delimiter']) === 0)) { + $cache[$folder] = _("Inbox") . substr($folder, 5); } else { $cache[$folder] = $folder; } -- 2.11.0