- Updated PEAR::Mail_Mime (#1484973)

1 files changed, 126 insertions, 25 deletions

diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php
index cfa3ca4fa..bb55ba9ca 100644
--- a/program/lib/Mail/mimePart.php
+++ b/program/lib/Mail/mimePart.php
@@ -135,10 +135,13 @@ class Mail_mimePart {
             define('MAIL_MIMEPART_CRLF', defined('MAIL_MIME_CRLF') ? MAIL_MIME_CRLF : "\r\n", TRUE);
         }
 
+        $contentType = array();
+        $contentDisp = array();
         foreach ($params as $key => $value) {
             switch ($key) {
                 case 'content_type':
-                    $headers['Content-Type'] = $value . (isset($charset) ? '; charset="' . $charset . '"' : '');
+                    $contentType['type'] = $value;
+                    //$headers['Content-Type'] = $value . (isset($charset) ? '; charset="' . $charset . '"' : '');
                     break;
 
                 case 'encoding':
@@ -151,15 +154,12 @@ class Mail_mimePart {
                     break;
 
                 case 'disposition':
-                    $headers['Content-Disposition'] = $value . (isset($dfilename) ? '; filename="' . $dfilename . '"' : '');
+                    $contentDisp['disp'] = $value;
                     break;
 
                 case 'dfilename':
-                    if (isset($headers['Content-Disposition'])) {
-                        $headers['Content-Disposition'] .= '; filename="' . $value . '"';
-                    } else {
-                        $dfilename = $value;
-                    }
+                    $contentDisp['filename'] = $value;
+                    $contentType['name'] = $value;
                     break;
 
                 case 'description':
@@ -167,15 +167,47 @@ class Mail_mimePart {
                     break;
 
                 case 'charset':
-                    if (isset($headers['Content-Type'])) {
-                        $headers['Content-Type'] .= '; charset="' . $value . '"';
-                    } else {
-                        $charset = $value;
-                    }
+                    $contentType['charset'] = $value;
+                    $contentDisp['charset'] = $value;
                     break;
+
+                case 'language':
+                    $contentType['language'] = $value;
+                    $contentDisp['language'] = $value;
+                    break;
+
+                case 'location':
+                    $headers['Content-Location'] = $value;
+                    break;
+
+            }
+        }
+        if (isset($contentType['type'])) {
+            $headers['Content-Type'] = $contentType['type'];
+            if (isset($contentType['name'])) {
+                $headers['Content-Type'] .= ';' . MAIL_MIMEPART_CRLF;
+                $headers['Content-Type'] .= $this->_buildHeaderParam('name', $contentType['name'], 
+                                                isset($contentType['charset']) ? $contentType['charset'] : 'US-ASCII', 
+                                                isset($contentType['language']) ? $contentType['language'] : NULL);
+            } elseif (isset($contentType['charset'])) {
+                $headers['Content-Type'] .= "; charset=\"{$contentType['charset']}\"";
             }
         }
 
+
+        if (isset($contentDisp['disp'])) {
+            $headers['Content-Disposition'] = $contentDisp['disp'];
+            if (isset($contentDisp['filename'])) {
+                $headers['Content-Disposition'] .= ';' . MAIL_MIMEPART_CRLF;
+                $headers['Content-Disposition'] .= $this->_buildHeaderParam('filename', $contentDisp['filename'], 
+                                                isset($contentDisp['charset']) ? $contentDisp['charset'] : 'US-ASCII', 
+                                                isset($contentDisp['language']) ? $contentDisp['language'] : NULL);
+            }
+        }
+        
+        
+        
+        
         // Default content-type
         if (!isset($headers['Content-Type'])) {
             $headers['Content-Type'] = 'text/plain';
@@ -207,9 +239,8 @@ class Mail_mimePart {
     {
         $encoded =& $this->_encoded;
 
-        if (!empty($this->_subparts)) {
-// http://pear.php.net/bugs/bug.php?id=13032
-//            srand((double)microtime()*1000000);
+        if (count($this->_subparts)) {
+            srand((double)microtime()*1000000);
             $boundary = '=_' . md5(rand() . microtime());
             $this->_headers['Content-Type'] .= ';' . MAIL_MIMEPART_CRLF . "\t" . 'boundary="' . $boundary . '"';
 
@@ -220,15 +251,15 @@ class Mail_mimePart {
                 foreach ($tmp['headers'] as $key => $value) {
                     $headers[] = $key . ': ' . $value;
                 }
-                $subparts[] = implode(MAIL_MIMEPART_CRLF, $headers) . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF . $tmp['body'];
+                $subparts[] = implode(MAIL_MIMEPART_CRLF, $headers) . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF . $tmp['body'] . MAIL_MIMEPART_CRLF;
             }
 
-            $encoded['body'] = '--' . $boundary . MAIL_MIMEPART_CRLF .
-                               implode('--' . $boundary . MAIL_MIMEPART_CRLF, $subparts) .
-                               '--' . $boundary.'--' . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF;
+            $encoded['body'] = '--' . $boundary . MAIL_MIMEPART_CRLF . 
+                               rtrim(implode('--' . $boundary . MAIL_MIMEPART_CRLF , $subparts), MAIL_MIMEPART_CRLF) . MAIL_MIMEPART_CRLF . 
+                               '--' . $boundary.'--' . MAIL_MIMEPART_CRLF;
 
         } else {
-            $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding) . MAIL_MIMEPART_CRLF;
+            $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
         }
 
         // Add headers to $encoded
@@ -307,7 +338,7 @@ class Mail_mimePart {
         $escape = '=';
         $output = '';
 
-        while(list(, $line) = each($lines)){
+        while (list(, $line) = each($lines)) {
 
             $line    = preg_split('||', $line, -1, PREG_SPLIT_NO_EMPTY);
             $linlen     = count($line);
@@ -317,17 +348,25 @@ class Mail_mimePart {
                 $char = $line[$i];
                 $dec  = ord($char);
 
-                if (($dec == 32) AND ($i == ($linlen - 1))){    // convert space at eol only
+                if (($dec == 32) AND ($i == ($linlen - 1))) {    // convert space at eol only
                     $char = '=20';
 
-                } elseif(($dec == 9) AND ($i == ($linlen - 1))) {  // convert tab at eol only
+                } elseif (($dec == 9) AND ($i == ($linlen - 1))) {  // convert tab at eol only
                     $char = '=09';
-                } elseif($dec == 9) {
+                } elseif ($dec == 9) {
                     ; // Do nothing if a tab.
-                } elseif(($dec == 61) OR ($dec < 32 ) OR ($dec > 126)) {
+                } elseif (($dec == 61) OR ($dec < 32 ) OR ($dec > 126)) {
                     $char = $escape . strtoupper(sprintf('%02s', dechex($dec)));
+                } elseif (($dec == 46) AND (($newline == '') || ((strlen($newline) + strlen("=2E")) >= $line_max))) {
+                    //Bug #9722: convert full-stop at bol,
+                    //some Windows servers need this, won't break anything (cipri)
+                    //Bug #11731: full-stop at bol also needs to be encoded
+                    //if this line would push us over the line_max limit.
+                    $char = '=2E';
                 }
 
+                //Note, when changing this line, also change the ($dec == 46)
+                //check line, as it mimics this line due to Bug #11731
                 if ((strlen($newline) + strlen($char)) >= $line_max) {        // MAIL_MIMEPART_CRLF is not counted
                     $output  .= $newline . $escape . $eol;                    // soft line break; " =\r\n" is okay
                     $newline  = '';
@@ -339,4 +378,66 @@ class Mail_mimePart {
         $output = substr($output, 0, -1 * strlen($eol)); // Don't want last crlf
         return $output;
     }
+
+    /**
+     * _buildHeaderParam()
+     *
+     * Encodes the paramater of a header.
+     *
+     * @param $name         The name of the header-parameter
+     * @param $value        The value of the paramter
+     * @param $charset      The characterset of $value
+     * @param $language     The language used in $value
+     * @param $maxLength    The maximum length of a line. Defauls to 75
+     *
+     * @access private
+     */
+    function _buildHeaderParam($name, $value, $charset=NULL, $language=NULL, $maxLength=75)
+    {
+        //If we find chars to encode, or if charset or language
+        //is not any of the defaults, we need to encode the value.
+        $shouldEncode = 0;
+        $secondAsterisk = '';
+        if (preg_match('#([\x80-\xFF]){1}#', $value)) {
+            $shouldEncode = 1;
+        } elseif ($charset && (strtolower($charset) != 'us-ascii')) {
+            $shouldEncode = 1;
+        } elseif ($language && ($language != 'en' && $language != 'en-us')) {
+            $shouldEncode = 1;
+        }
+        if ($shouldEncode) {
+            $search  = array('%',   ' ',   "\t");
+            $replace = array('%25', '%20', '%09');
+            $encValue = str_replace($search, $replace, $value);
+            $encValue = preg_replace('#([\x80-\xFF])#e', '"%" . strtoupper(dechex(ord("\1")))', $encValue);
+            $value = "$charset'$language'$encValue";
+            $secondAsterisk = '*';
+        }
+        $header = " {$name}{$secondAsterisk}=\"{$value}\"; ";
+        if (strlen($header) <= $maxLength) {
+            return $header;
+        }
+
+        $preLength = strlen(" {$name}*0{$secondAsterisk}=\"");
+        $sufLength = strlen("\";");
+        $maxLength = MAX(16, $maxLength - $preLength - $sufLength - 2);
+        $maxLengthReg = "|(.{0,$maxLength}[^\%][^\%])|";
+
+        $headers = array();
+        $headCount = 0;
+        while ($value) {
+            $matches = array();
+            $found = preg_match($maxLengthReg, $value, $matches);
+            if ($found) {
+                $headers[] = " {$name}*{$headCount}{$secondAsterisk}=\"{$matches[0]}\"";
+                $value = substr($value, strlen($matches[0]));
+            } else {
+                $headers[] = " {$name}*{$headCount}{$secondAsterisk}=\"{$value}\"";
+                $value = "";
+            }
+            $headCount++;
+        }
+        $headers = implode(MAIL_MIMEPART_CRLF, $headers) . ';';
+        return $headers;
+    }
 } // End of class