Changeset 5425 in subversion

Timestamp:

Nov 15, 2011 4:22:13 AM (19 months ago)

Author:

alec

Message:

• Fix commit r5424 + preformance microoptimizations

File:

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

trunk/roundcubemail/program/include/rcube_imap.php

@@ -3178 +3178 @@
                 if (is_array($ns)) {
                     foreach ($ns as $ns_data) {
-                        if ($len = strlen($ns_data[0])) {
-                            $search = array('len' => $len, 'prefix' => $ns_data[0]);
+                        if (strlen($ns_data[0])) {
+                            $search = $ns_data[0];
                         }
                     }
@@ -3187 +3187 @@
             if (!empty($search)) {
                 // go through all folders detecting namespace usage
-                foreach ($list as $folder) {
-                    foreach ($search as $idx => $s) {
-                        if ($s['prefix'] == substr($folder, 0, $s['len'])) {
+                foreach ($result as $folder) {
+                    foreach ($search as $idx => $prefix) {
+                        if (strpos($folder, $prefix) === 0) {
                             unset($search[$idx]);
                         }
@@ -3199 +3199 @@
 
                 // get folders in hidden namespaces and add to the result
-                foreach ($search as $s) {
-                    $list = $this->conn->listMailboxes($s['prefix'], $name);
+                foreach ($search as $prefix) {
+                    $list = $this->conn->listMailboxes($prefix, $name);
 
                     if (!empty($list)) {
@@ -3485 +3485 @@
             if (is_array($namespace)) {
                 foreach ($namespace as $ns) {
-                    if (strlen($ns[0])) {
-                        if ((strlen($ns[0])>1 && $mailbox == substr($ns[0], 0, -1))
+                    if ($len = strlen($ns[0])) {
+                        if (($len > 1 && $mailbox == substr($ns[0], 0, -1))
                             || strpos($mailbox, $ns[0]) === 0
                         ) {