Changeset 2738 in subversion for trunk/roundcubemail/program/lib/imap.inc

Timestamp:

Jul 11, 2009 4:29:34 PM (4 years ago)

Author:

alec

Message:

• few fixes for last commits

File:

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

trunk/roundcubemail/program/lib/imap.inc

@@ -2250 +2250 @@
                                 $result = substr($line, $from, $len);
                         }
-            
+
                         if ($mode == 1)
                                 $result = base64_decode($result);
@@ -2266 +2266 @@
                         $bytes    = (int)$sizeStr;
                         $prev     = '';
-                        
+
                         while ($bytes > 0) {
                                 $line      = iil_ReadLine($fp, 1024);
@@ -2330 +2330 @@
                                 $line = iil_ReadLine($fp, 1024);
                         } while (!iil_StartsWith($line, $key, true));
-        
+
                 if ($result) {
                         $result = rtrim($result, "\t\r\n\0\x0B");
@@ -2339 +2339 @@
                         } else
                                 return $result; // substr($result, 0, strlen($result)-1);
+
+                        return true;
                 }
-                
-                return true;
         }
     
@@ -2481 +2481 @@
                                 $line = iil_ReadLine($fp, 5000);
                                 $line = iil_MultLine($fp, $line);
-                                list(, $index, $cmd, $rest) = explode(' ', $line);
-                                if ($cmd != 'FETCH' || $index == $id || preg_match("/^$key/", $line))
+                                if (!preg_match("/^$key/", $line))
                                         $result .= $line;
                         } while (!preg_match("/^$key/", $line));
 
-                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -(strlen($result)-strrpos($result, $key)+1)));
+                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -1));
                 }
         }