Changeset 4198 in subversion for trunk/roundcubemail/program/include/rcube_imap_generic.php

Timestamp:

Nov 9, 2010 2:54:34 AM (3 years ago)

Author:

alec

Message:

• Add support for shared folders (#1403507)

File:

• trunk/roundcubemail/program/include/rcube_imap_generic.php (modified) (5 diffs)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -550 +550 @@
 
     /**
-     * Gets the root directory and delimiter (of personal namespace)
-     *
-     * @return mixed A root directory name, or false.
-     */
-    function getRootDir()
-    {
-            if (isset($this->prefs['rootdir']) && is_string($this->prefs['rootdir'])) {
-                return $this->prefs['rootdir'];
-            }
-
-            if (!is_array($data = $this->getNamespace())) {
-                return false;
-            }
-
-            $user_space_data = $data['personal'];
-            if (!is_array($user_space_data)) {
-                return false;
-            }
-
-            $first_userspace = $user_space_data[0];
-            if (count($first_userspace) !=2) {
-                return false;
-            }
-
-        $rootdir                  = $first_userspace[0];
-            $this->prefs['delimiter'] = $first_userspace[1];
-            $this->prefs['rootdir']   = $rootdir ? substr($rootdir, 0, -1) : '';
-
-            return $this->prefs['rootdir'];
-    }
-
-    /**
-     * Gets the delimiter, for example:
-     * INBOX.foo -> .
-     * INBOX/foo -> /
-     * INBOX\foo -> \
-     *
-     * @return mixed A delimiter (string), or false.
-     * @see connect()
+     * Gets the delimiter
+     *
+     * @return string The delimiter
      */
     function getHierarchyDelimiter()
@@ -594 +558 @@
             if ($this->prefs['delimiter']) {
                 return $this->prefs['delimiter'];
-            }
-            if (!empty($this->prefs['delimiter'])) {
-            return $this->prefs['delimiter'];
             }
 
@@ -612 +573 @@
         }
 
-            // if that fails, try namespace extension
-            // try to fetch namespace data
-            if (!is_array($data = $this->getNamespace())) {
-            return false;
-        }
-
-            // extract user space data (opposed to global/shared space)
-            $user_space_data = $data['personal'];
-            if (!is_array($user_space_data)) {
-                return false;
-            }
-
-            // get first element
-            $first_userspace = $user_space_data[0];
-            if (!is_array($first_userspace)) {
-                return false;
-            }
-
-            // extract delimiter
-            return $this->prefs['delimiter'] = $first_userspace[1];
+        return NULL;
     }
 
@@ -831 +773 @@
                             $this->clearCapability();
             }
-                    $this->getRootDir();
             $this->logged = true;
 
@@ -1944 +1885 @@
             }
 
-            if (empty($ref) && $this->prefs['rootdir']) {
-                $ref = $this->prefs['rootdir'];
-            }
-
         $args = array();