- 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    

3 files changed, 22 insertions, 3 deletions

diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 543895dec..d342124a4 100644
--- a/program/steps/mail/sendmail.inc
+++ b/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
+	);
     }
 
 
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index f115ad900..04079e16f 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -224,6 +224,18 @@ function rcmail_user_prefs_form($attrib)
     $table->add(null, $select_autosave->show($config['draft_autosave']));
   }
 
+  if (!isset($no_override['mime_param_folding'])) {
+    $field_id = 'rcmfd_param_folding';
+    $select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
+    $select_param_folding->add(rcube_label('2231folding'), 0);
+    $select_param_folding->add(rcube_label('miscfolding'), 1);
+    $select_param_folding->add(rcube_label('2047folding'), 2);
+
+    $table->set_row_attribs('advanced');
+    $table->add('title', html::label($field_id, Q(rcube_label('mimeparamfolding'))));
+    $table->add(null, $select_param_folding->show($config['mime_param_folding']));
+  }
+
   $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagescomposition'))) . $table->show($attrib));
 
   // Configure special folders
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 8e2a27953..b3b75ffe4 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -35,6 +35,7 @@ $a_user_prefs = array(
   'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,
   'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
   'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
+  'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
   'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
   'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
   'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST),