Changeset 2331 in subversion

Timestamp:

Mar 6, 2009 4:12:41 AM (4 years ago)

Author:

alec

Message:

• Fix FETCH result parsing for servers returning flags at the end of result (#1485763)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/imap.inc (modified) (6 diffs)

trunk/roundcubemail/CHANGELOG

@@ -5 +5 @@
 ----------
 - Fix errors handling in IMAP command continuations (#1485762)
+- Fix FETCH result parsing for servers returning flags at the end of result (#1485763)
 
 2009/03/04 (alec)

trunk/roundcubemail/program/lib/imap.inc

@@ -1691 +1691 @@
                 $line = iil_ReadLine($fp, 1024);
                 $line = iil_MultLine($fp, $line);
-                
+
                 $a    = explode(' ', $line);
                 if (($line[0] == '*') && ($a[2] == 'FETCH')) {
@@ -1719 +1719 @@
                                 // did we get the right number of replies?
                                 $parts_count = count($a);
-                                if ($parts_count>=8) {
+                                if ($parts_count>=6) {
                                         for ($i=0; $i<$parts_count; $i=$i+2) {
                                                 if (strcasecmp($a[$i],'UID') == 0)
@@ -1729 +1729 @@
                                                 else if (strcasecmp($a[$i],'FLAGS') == 0)
                                                         $flags_str = $a[$i+1];
-                                        }
-
-                                        // process flags
-                                        $flags_str = eregi_replace('[\\\"]', '', $flags_str);
-                                        $flags_a   = explode(' ', $flags_str);
-                                        
-                                        if (is_array($flags_a)) {
-                                                reset($flags_a);
-                                                while (list(,$val)=each($flags_a)) {
-                                                        if (strcasecmp($val,'Seen') == 0) {
-                                                            $result[$id]->seen = true;
-                                                        } else if (strcasecmp($val, 'Deleted') == 0) {
-                                                            $result[$id]->deleted=true;
-                                                        } else if (strcasecmp($val, 'Recent') == 0) {
-                                                            $result[$id]->recent = true;
-                                                        } else if (strcasecmp($val, 'Answered') == 0) {
-                                                            $result[$id]->answered = true;
-                                                        } else if (strcasecmp($val, '$Forwarded') == 0) {
-                                                            $result[$id]->forwarded = true;
-                                                        } else if (strcasecmp($val, 'Draft') == 0) {
-                                                            $result[$id]->is_draft = true;
-                                                        } else if (strcasecmp($val, '$MDNSent') == 0) {
-                                                            $result[$id]->mdn_sent = true;
-                                                        } else if (strcasecmp($val, 'Flagged') == 0) {
-                                                             $result[$id]->flagged = true;
-                                                        }
-                                                }
-                                                $result[$id]->flags = $flags_a;
                                         }
 
@@ -1801 +1773 @@
                                 foreach ($reslines as $line) {
                                         if (ord($line[0])<=32) {
-                                            $lines[$ln] .= (empty($lines[$ln])?'':"\n").trim($line);
+                                                $lines[$ln] .= (empty($lines[$ln])?'':"\n").trim($line);
                                         } else {
                                                 $lines[++$ln] = trim($line);
@@ -1818 +1790 @@
                                 $line = chop(iil_ReadLine($fp, 300), "\r\n");
 
+                                // The preg_match below works around communigate imap, which outputs " UID <number>)".
+                                // Without this, the while statement continues on and gets the "FH0 OK completed" message.
+                                // If this loop gets the ending message, then the outer loop does not receive it from radline on line 1249.  
+                                // This in causes the if statement on line 1278 to never be true, which causes the headers to end up missing
+                                // If the if statement was changed to pick up the fh0 from this loop, then it causes the outer loop to spin
+                                // An alternative might be:
+                                // if (!preg_match("/:/",$line) && preg_match("/\)$/",$line)) break;
+                                // however, unsure how well this would work with all imap clients.
+                                if (preg_match("/^\s*UID [0-9]+\)$/", $line)) {
+                                    break;
+                                }
+
+                                // handle FLAGS reply after headers (AOL, Zimbra?)
+                                if (preg_match('/\s+FLAGS \((.*)\)\)$/', $line, $matches)) {
+                                        $flags_str = $matches[1];
+                                        break;
+                                }
+
                                 if (ord($line[0])<=32) {
-                                    $lines[$ln] .= (empty($lines[$ln])?'':"\n").trim($line);
+                                        $lines[$ln] .= (empty($lines[$ln])?'':"\n").trim($line);
                                 } else {
                                         $lines[++$ln] = trim($line);
-                                }
-                                /* 
-                                        The preg_match below works around communigate imap, which outputs " UID <number>)".
-                                        Without this, the while statement continues on and gets the "FH0 OK completed" message.
-                                        If this loop gets the ending message, then the outer loop does not receive it from radline on line 1249.  
-                                        This in causes the if statement on line 1278 to never be true, which causes the headers to end up missing
-                                        If the if statement was changed to pick up the fh0 from this loop, then it causes the outer loop to spin
-                                        An alternative might be:
-                                        if (!preg_match("/:/",$line) && preg_match("/\)$/",$line)) break;
-                                        however, unsure how well this would work with all imap clients.
-                                */
-                                if (preg_match("/^\s*UID [0-9]+\)$/", $line)) {
-                                    break;
                                 }
                         // patch from "Maksim Rubis" <siburny@hotmail.com>
@@ -1923 +1900 @@
                                 $a = explode(' ', $line);
                         }
+
+                        // process flags
+                        if (!empty($flags_str)) {
+                                $flags_str = eregi_replace('[\\\"]', '', $flags_str);
+                                $flags_a   = explode(' ', $flags_str);
+                                        
+                                if (is_array($flags_a)) {
+                                        reset($flags_a);
+                                        while (list(,$val)=each($flags_a)) {
+                                                if (strcasecmp($val,'Seen') == 0) {
+                                                    $result[$id]->seen = true;
+                                                } else if (strcasecmp($val, 'Deleted') == 0) {
+                                                    $result[$id]->deleted=true;
+                                                } else if (strcasecmp($val, 'Recent') == 0) {
+                                                    $result[$id]->recent = true;
+                                                } else if (strcasecmp($val, 'Answered') == 0) {
+                                                        $result[$id]->answered = true;
+                                                } else if (strcasecmp($val, '$Forwarded') == 0) {
+                                                        $result[$id]->forwarded = true;
+                                                } else if (strcasecmp($val, 'Draft') == 0) {
+                                                        $result[$id]->is_draft = true;
+                                                } else if (strcasecmp($val, '$MDNSent') == 0) {
+                                                        $result[$id]->mdn_sent = true;
+                                                } else if (strcasecmp($val, 'Flagged') == 0) {
+                                                         $result[$id]->flagged = true;
+                                                }
+                                        }
+                                        $result[$id]->flags = $flags_a;
+                                }
+                        }
                 }
         } while (strcmp($a[0], $key) != 0);