Changeset 4879 in subversion

Timestamp:

Jun 27, 2011 3:09:15 AM (2 years ago)

Author:

alec

Message:

• Fix PHP warning in mailbox_info(),
• Set namespace/delimiter in constructor (this way some methods could be used before connecting to IMAP server)

File:

• trunk/roundcubemail/program/include/rcube_imap.php (modified) (3 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -122 +122 @@
     {
         $this->conn = new rcube_imap_generic();
+
+        // Set namespace and delimiter from session,
+        // so some methods would work before connection
+        if (isset($_SESSION['imap_namespace']))
+            $this->namespace = $_SESSION['imap_namespace'];
+        if (isset($_SESSION['imap_delimiter']))
+            $this->delimiter = $_SESSION['imap_delimiter'];
     }
 
@@ -550 +557 @@
     {
         if ($this->delimiter !== null && $this->namespace !== null) {
-            return;
-        }
-
-        if (isset($_SESSION['imap_namespace']) && isset($_SESSION['imap_delimiter'])) {
-            $this->namespace = $_SESSION['imap_namespace'];
-            $this->delimiter = $_SESSION['imap_delimiter'];
             return;
         }
@@ -3506 +3507 @@
             $mbox = $mailbox . $this->delimiter;
             foreach ($namespace as $ns) {
-                foreach ($ns as $item) {
-                    if ($item[0] === $mbox) {
-                        $options['is_root'] = true;
-                        break;
+                if (!empty($ns)) {
+                    foreach ($ns as $item) {
+                        if ($item[0] === $mbox) {
+                            $options['is_root'] = true;
+                            break;
+                        }
                     }
                 }