From 5e5383bf1a29a417591927857a9669b1230a22b9 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Thu, 11 Mar 2010 21:57:32 +0100
Subject: [PATCH] Move getTitle() into the namespace handler.

---
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php |  7 +------
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php    | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
index 19e5901b5..bfea56776 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
@@ -544,12 +544,7 @@ class Horde_Kolab_Storage_Folder
     function getTitle()
     {
         if (!isset($this->_title) && isset($this->name)) {
-            $title = $this->name;
-            if (substr($title, 0, 6) == 'INBOX/') {
-                $title = substr($title, 6);
-            }
-            $title = str_replace('/', ':', $title);
-            $this->_title = Horde_String::convertCharset($title, 'UTF7-IMAP');
+            $this->_title = $this->_namespace->getTitle($this->name);
         }
         return $this->_title;
     }
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
index 6411fc697..0401a2318 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
@@ -29,4 +29,18 @@
  */
 class Horde_Kolab_Storage_Namespace
 {
+
+    /**
+     * Return the title of a folder.
+     *
+     * @param string $name The name of the folder.
+     */
+    public function getTitle($name)
+    {
+        if (substr($name, 0, 6) == 'INBOX/') {
+            $name = substr($name, 6);
+        }
+        $name = str_replace('/', ':', $name);
+        return Horde_String::convertCharset($name, 'UTF7-IMAP');
+    }
 }
\ No newline at end of file
-- 
2.11.0