Changeset 2569 in subversion

Timestamp:

May 29, 2009 8:08:58 AM (4 years ago)

Author:

alec

Message:

• re-fix #1485884

File:

• trunk/roundcubemail/program/lib/imap.inc (modified) (10 diffs)

trunk/roundcubemail/program/lib/imap.inc

@@ -84 +84 @@
                 - handling connection startup response
                 - added UID EXPUNGE support
-                - fixed problem with double quote at the end of folder name in LIST and LSUB 
+                - fixed problem with double quotes and spaces in folder names in LIST and LSUB 
 
 ********************************************************/
@@ -256 +256 @@
 }
 
-function iil_MultLine($fp, $line) {
+function iil_MultLine($fp, $line, $escape=false) {
         $line = chop($line);
         if (preg_match('/\{[0-9]+\}$/', $line)) {
@@ -267 +267 @@
                         $out .= $line;
                 }
-                $line = $a[1][0] . "\"$out\"";
+
+                $line = $a[1][0] . '"' . ($escape ? iil_Escape($out) : $out) . '"';
 //              console('[...] '. $out);
         }
@@ -727 +728 @@
 
 function iil_ExplodeQuotedString($delimiter, $string) {
-        $quotes = explode('"', $string);
-        while ( list($key, $val) = each($quotes)) {
-                if (($key % 2) == 1) {
-                        $quotes[$key] = str_replace($delimiter, "_!@!_", $quotes[$key]);
-                }
-        }
-        $string = implode('"', $quotes);
-        
-        $result = explode($delimiter, $string);
-        while ( list($key, $val) = each($result) ) {
-                $result[$key] = str_replace('_!@!_', $delimiter, $result[$key]);
-        }
-    
+        $result = array();
+        $strlen = strlen($string);
+          
+        for ($q=$p=$i=0; $i < $strlen; $i++) {
+                if ($string[$i] == "\"" && $string[$i-1] != "\\") {
+                        $q = $q ? false : true;
+                }
+                else if (!$q && preg_match("/$delimiter/", $string[$i])) {
+                        $result[] = substr($string, $p, $i - $p);
+                        $p = $i + 1;
+                }
+        }
+
+        $result[] = substr($string, $p);
         return $result;
 }
@@ -1530 +1532 @@
                 return false;
         }
-                
+
         if ($add)
                 $add = ' '.strtoupper(trim($add));
@@ -2150 +2152 @@
         do {
                 $line = iil_ReadLine($fp, 500);
-                $line = iil_MultLine($fp, $line);
+                $line = iil_MultLine($fp, $line, true);
 
                 $a = explode(' ', $line);
@@ -2158 +2160 @@
                         $a = iil_ExplodeQuotedString(' ', $line);
                         // last string is folder name
-                        $folder = preg_replace(array('/^"/', '/"$/'), '', $a[count($a)-1]);
+                        $folder = preg_replace(array('/^"/', '/"$/'), '', iil_UnEscape($a[count($a)-1]));
             
                         if (empty($ignore) || (!empty($ignore)
@@ -2215 +2217 @@
         do {
                 $line = iil_ReadLine($fp, 500);
-                $line = iil_MultLine($fp, $line);
+                $line = iil_MultLine($fp, $line, true);
                 $a    = explode(' ', $line);
         
@@ -2223 +2225 @@
                         // split one line
                         $a = iil_ExplodeQuotedString(' ', $line);
-            
                         // last string is folder name
-                        $folder = preg_replace(array('/^"/', '/"$/'), '', $a[count($a)-1]);
+                        $folder = preg_replace(array('/^"/', '/"$/'), '', iil_UnEscape($a[count($a)-1]));
         
                         if ((!in_array($folder, $folders)) && (empty($ignore)
@@ -2623 +2624 @@
                 }
         }
+        console('----'.$result);
         return $result;
 }