Changeset fc7a41f in github

Timestamp:

Oct 25, 2010 4:32:53 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

2b42838

Parents:

781f0ca5

Message:

• Small improvements in NAMESPACE handling

File:

• program/include/rcube_imap_generic.php (modified) (9 diffs)

program/include/rcube_imap_generic.php

@@ -535 +535 @@
     }
 
-    function getNamespace()
+    function getRootDir()
     {
             if (isset($this->prefs['rootdir']) && is_string($this->prefs['rootdir'])) {
@@ -542 +542 @@
             }
 
-            if (!is_array($data = $this->_namespace())) {
+            if (!is_array($data = $this->getNamespace())) {
                 return false;
             }
 
-            $user_space_data = $data[0];
+            $user_space_data = $data['personal'];
             if (!is_array($user_space_data)) {
                 return false;
@@ -552 +552 @@
 
             $first_userspace = $user_space_data[0];
-            if (count($first_userspace)!=2) {
+            if (count($first_userspace) !=2 ) {
                 return false;
             }
@@ -563 +563 @@
             return true;
     }
-
 
     /**
@@ -599 +598 @@
             // if that fails, try namespace extension
             // try to fetch namespace data
-            if (!is_array($data = $this->_namespace())) {
+            if (!is_array($data = $this->getNamespace())) {
             return false;
         }
 
             // extract user space data (opposed to global/shared space)
-            $user_space_data = $data[0];
+            $user_space_data = $data['personal'];
             if (!is_array($user_space_data)) {
                 return false;
@@ -619 +618 @@
     }
 
-    function _namespace()
-    {
+    /**
+     * NAMESPACE handler (RFC 2342)
+     *
+     * @return array Namespace data hash (personal, other, shared)
+     */
+    function getNamespace()
+    {
+        if (array_key_exists('namespace', $this->prefs)) {
+            return $this->prefs['namespace'];
+        }
+    
         if (!$this->getCapability('NAMESPACE')) {
-                return false;
+                return self::ERROR_BAD;
             }
 
@@ -628 +636 @@
 
                 if ($code == self::ERROR_OK && preg_match('/^\* NAMESPACE /', $response)) {
-                $data = $this->parseNamespace(substr($response, 11), $i, 0, 0);
+                $data = $this->tokenizeResponse(substr($response, 11));
                 }
 
             if (!is_array($data)) {
-                return false;
-            }
-
-        return $data;
+                return $code;
+            }
+
+        $this->prefs['namespace'] = array(
+            'personal' => $data[0],
+            'other'    => $data[1],
+            'shared'   => $data[2],
+        );
+
+        return $this->prefs['namespace'];
     }
 
@@ -790 +804 @@
                             $this->clearCapability();
             }
-                    $this->getNamespace();
+                    $this->getRootDir();
             $this->logged = true;
 
@@ -2954 +2968 @@
     }
 
-    private function parseNamespace($str, &$i, $len=0, $l)
-    {
-            if (!$l) {
-                $str = str_replace('NIL', '()', $str);
-            }
-            if (!$len) {
-                $len = strlen($str);
-            }
-            $data      = array();
-            $in_quotes = false;
-            $elem      = 0;
-
-        for ($i; $i<$len; $i++) {
-                    $c = (string)$str[$i];
-                    if ($c == '(' && !$in_quotes) {
-                            $i++;
-                            $data[$elem] = $this->parseNamespace($str, $i, $len, $l++);
-                            $elem++;
-                    } else if ($c == ')' && !$in_quotes) {
-                            return $data;
-                } else if ($c == '\\') {
-                            $i++;
-                            if ($in_quotes) {
-                                    $data[$elem] .= $str[$i];
-                        }
-                    } else if ($c == '"') {
-                            $in_quotes = !$in_quotes;
-                            if (!$in_quotes) {
-                                    $elem++;
-                        }
-                    } else if ($in_quotes) {
-                            $data[$elem].=$c;
-                    }
-            }
-
-        return $data;
-    }
-
     private function parseCapability($str)
     {