Move setName() into the namespace handler.

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
index dcd3c18..0d6112f 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
@@ -256,11 +256,7 @@ class Horde_Kolab_Storage_Folder
      */
     function setName($name)
     {
-        $name = str_replace(':', '/', $name);
-        if (substr($name, 0, 5) != 'user/' && substr($name, 0, 7) != 'shared.') {
-            $name = 'INBOX/' . $name;
-        }
-        $this->new_name = Horde_String::convertCharset($name, Horde_Nls::getCharset(), 'UTF7-IMAP');
+        $this->new_name = $this->_namespace->setName($name);
     }
 
     /**

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
index c0cf2a9..603d658 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
@@ -71,4 +71,19 @@ class Horde_Kolab_Storage_Namespace
             return  'anonymous';
         }
     }
+
+    /**
+     * Generate a new name for a folder.
+     *
+     * @param string $name  The new folder name.
+     */
+    function setName($name)
+    {
+        $name = str_replace(':', '/', $name);
+        if (substr($name, 0, 5) != 'user/' && substr($name, 0, 7) != 'shared.') {
+            $name = 'INBOX/' . $name;
+        }
+        return Horde_String::convertCharset($name, Horde_Nls::getCharset(), 'UTF7-IMAP');
+    }
+
 }
\ No newline at end of file