Ticket #1484442: forward.diff

program/steps/mail/compose.inc

@@ -522 +522 @@
 
   // add attachments
   if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE->mime_parts))
-    rcmail_write_compose_attachments($MESSAGE);
+    rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
     
   return $prefix.$body;
 }
@@ -539 +539 @@
   if (!isset($_SESSION['compose']['forward_attachments'])
       && is_array($MESSAGE->mime_parts)
       && count($MESSAGE->mime_parts) > 0)
-    rcmail_write_compose_attachments($MESSAGE);
+    rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
 
   return $body;
 }
   
   
-function rcmail_write_compose_attachments(&$message)
+function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
 {
   global $RCMAIL, $IMAP;
 
@@ -556 +556 @@
   
   foreach ((array)$message->mime_parts as $pid => $part)
   {
-    if ($part->ctype_primary != 'message' &&
+    if (($part->ctype_primary != 'message' || !$bodyIsHtml) &&
         ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] ||
          (empty($part->disposition) && $part->filename)))
     {

program/steps/mail/sendmail.inc

@@ -266 +266 @@
   $MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
   }
 
+// chose transfer encoding
+$charset_7bit = array('ASCII', 'ISO-2022-JP', 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-15');
+$transfer_encoding = in_array(strtoupper($message_charset), $charset_7bit) ? '7bit' : '8bit';
 
 // add stored attachments, if any
 if (is_array($_SESSION['compose']['attachments']))
@@ -285 +288 @@
         We need to replace mime_content_type in a later release because the function
         is deprecated in favour of File_Info
       */
+      $ctype = rc_mime_content_type($attachment['path'], $attachment['mimetype']);
+      $ctype = str_replace('image/pjpeg', 'image/jpeg', $ctype); // #1484914
+
+      // .eml attachments send inline
       $MAIL_MIME->addAttachment($attachment['path'],
-        rc_mime_content_type($attachment['path'], $attachment['mimetype']),
-        $attachment['name'], true, 'base64',
-        'attachment', $message_charset);
+        $ctype, 
+        $attachment['name'], true, 
+        ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'),
+        ($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
+        $message_charset);
     }
   }
 
 // add submitted attachments
 if (is_array($_FILES['_attachments']['tmp_name']))
   foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
-    $MAIL_MIME->addAttachment($filepath, $files['type'][$i], $files['name'][$i], true, 'base64', 'attachment', $message_charset);
-
+    {
+    $ctype = $files['type'][$i];
+    $ctype = str_replace('image/pjpeg', 'image/jpeg', $ctype); // #1484914
+    
+    $MAIL_MIME->addAttachment($filepath, $ctype, $files['name'][$i], true,
+        ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'),
+        'attachment', $message_charset);
+    }
 
-// chose transfer encoding
-$charset_7bit = array('ASCII', 'ISO-2022-JP', 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-15');
-$transfer_encoding = in_array(strtoupper($message_charset), $charset_7bit) ? '7bit' : '8bit';
 
 // encoding settings for mail composing
 $MAIL_MIME->setParam(array(