Changeset 1849 in subversion

Timestamp:

Sep 19, 2008 12:20:39 PM (5 years ago)

Author:

alec

Message:

applied tensor's patch: incorrect handling of filename of second and subsequent long non-ASCII attachments

File:

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

trunk/roundcubemail/program/include/rcube_imap.php

@@ -1199 +1199 @@
       // some servers (eg. dovecot-1.x) have no support for parameter value continuations
       // we must fetch and parse headers "manually"
+      //TODO: fetching headers for a second time is not effecient, this code should be moved somewhere earlier --tensor
       if ($i<2) {
         // TODO: fetch only Content-Type/Content-Disposition header
-        $headers = iil_C_FetchPartBody($this->conn, $this->mailbox, $this->_msg_id, $struct->mime_id.'.HEADER');
+        $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
         $filename_mime = '';
         $i = 0;
@@ -1217 +1218 @@
         }
       if ($i<2) {
-        $headers = iil_C_FetchPartBody($this->conn, $this->mailbox, $this->_msg_id, $struct->mime_id.'.HEADER');
+        $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
         $filename_encoded = '';
-        $i = 0;
+        $i = 0; $matches = array();
         while (preg_match('/filename\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
           $filename_encoded .= $matches[1];
@@ -1233 +1234 @@
         }
       if ($i<2) {
-        $headers = iil_C_FetchPartBody($this->conn, $this->mailbox, $this->_msg_id, $struct->mime_id.'.HEADER');
+        $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
         $filename_mime = '';
-        $i = 0;
+        $i = 0; $matches = array();
         while (preg_match('/\s+name\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
           $filename_mime .= $matches[1];
@@ -1249 +1250 @@
         }
       if ($i<2) {
-        $headers = iil_C_FetchPartBody($this->conn, $this->mailbox, $this->_msg_id, $struct->mime_id.'.HEADER');
+        $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
         $filename_encoded = '';
-        $i = 0;
+        $i = 0; $matches = array();
         while (preg_match('/\s+name\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
           $filename_encoded .= $matches[1];