- Added 'mime_param_folding' option with possibility to choose

  long/non-ascii attachment names encoding eg. to be readable
  in MS Outlook/OE (#1485320)
- Added "advanced options" feature in User Preferences    


git-svn-id: https://svn.roundcube.net/trunk@1897 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 9 insertions, 3 deletions

diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 543895dec..d342124a4 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -304,7 +304,10 @@ if (is_array($_SESSION['compose']['attachments']))
         $attachment['name'], true, 
         ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'),
         ($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
-        $message_charset);
+        $message_charset, '', '', 
+	$CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
+	$CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL
+	);
     }
   }
 
@@ -316,8 +319,11 @@ if (is_array($_FILES['_attachments']['tmp_name']))
     $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);
+	$ctype == 'message/rfc822' ? $transfer_encoding : 'base64',
+	'attachment', $message_charset, '', '', 
+	$CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
+	$CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL
+	);
     }