Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

- Added force_7bit option to force MIME encoding of plain/text messag…

…es (#1486510)
  • Loading branch information...
commit 47ad83f337c9eeb4bc53afb85a71cf90a8a34106 1 parent d5ffb58
Aleksander Machniak alecpl authored
1  CHANGELOG
... ... @@ -1,6 +1,7 @@
1 1 CHANGELOG RoundCube Webmail
2 2 ===========================
3 3
  4 +- Added force_7bit option to force MIME encoding of plain/text messages (#1486510)
4 5 - Use case sensitive check when checking for default folders (#1486346)
5 6 - Fix checking for new mail: now checks unseen count of inbox (#1485794)
6 7 - Improve performance by avoiding unnecessary updates to the session table (#1486325)
3  config/main.inc.php.dist
@@ -472,5 +472,8 @@ $rcmail_config['show_sig'] = 1;
472 472 // When replying or forwarding place sender's signature above existing message
473 473 $rcmail_config['sig_above'] = FALSE;
474 474
  475 +// Use MIME encoding (quoted-printable) for 8bit characters in message body
  476 +$rcmail_config['force_7bit'] = FALSE;
  477 +
475 478 // end of config file
476 479 ?>
1  program/localization/en_US/labels.inc
@@ -302,6 +302,7 @@ $labels['mimeparamfolding'] = 'Attachment names';
302 302 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
303 303 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
304 304 $labels['2047folding'] = 'Full RFC 2047 (other)';
  305 +$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
305 306 $labels['advancedoptions'] = 'Advanced options';
306 307 $labels['focusonnewmessage'] = 'Focus browser window on new message';
307 308 $labels['checkallfolders'] = 'Check all folders for new messages';
1  program/localization/pl_PL/labels.inc
@@ -236,6 +236,7 @@ $labels['mimeparamfolding'] = 'Stosuj nazwy załączników zgodne z';
236 236 $labels['2231folding'] = 'RFC 2231 (Thunderbird)';
237 237 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
238 238 $labels['2047folding'] = 'RFC 2047 (przestarzałe)';
  239 +$labels['force7bit'] = 'Używaj kodowania MIME dla znaków 8-bitowych';
239 240 $labels['advancedoptions'] = 'opcje zaawansowane';
240 241 $labels['readwhendeleted'] = 'Podczas usuwania oznacz wiadomość jako przeczytaną';
241 242 $labels['flagfordeletion'] = 'Oznacz wiadomość do usunięcia zamiast ją usuwać';
2  program/steps/mail/sendmail.inc
@@ -456,7 +456,7 @@ if (is_array($_SESSION['compose']['attachments']))
456 456
457 457 // choose transfer encoding for plain/text body
458 458 if (preg_match('/[^\x00-\x7F]/', $MAIL_MIME->getTXTBody()))
459   - $transfer_encoding = '8bit';
  459 + $transfer_encoding = $RCMAIL->config->get('force_7bit') ? 'quoted-printable' : '8bit';
460 460 else
461 461 $transfer_encoding = '7bit';
462 462
12 program/steps/settings/func.inc
@@ -449,7 +449,17 @@ function rcmail_user_prefs($current=null)
449 449 'content' => $select_param_folding->show($config['mime_param_folding']),
450 450 );
451 451 }
452   -
  452 +
  453 + if (!isset($no_override['force_7bit'])) {
  454 + $field_id = 'rcmfd_force_7bit';
  455 + $input_7bit = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));
  456 +
  457 + $blocks['main']['options']['force_7bit'] = array(
  458 + 'title' => html::label($field_id, Q(rcube_label('force7bit'))),
  459 + 'content' => $input_7bit->show($config['force_7bit']?1:0),
  460 + );
  461 + }
  462 +
453 463 if (!isset($no_override['top_posting'])) {
454 464 $field_id = 'rcmfd_top_posting';
455 465 $select_replymode = new html_select(array('name' => '_top_posting', 'id' => $field_id, 'onchange' => "\$('#rcmfd_sig_above').attr('disabled',this.selectedIndex==0)"));
1  program/steps/settings/save_prefs.inc
@@ -62,6 +62,7 @@ switch ($CURR_SECTION)
62 62 'htmleditor' => isset($_POST['_htmleditor']) ? TRUE : FALSE,
63 63 'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
64 64 'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
  65 + 'force_7bit' => isset($_POST['_force_7bit']) ? TRUE : FALSE,
65 66 'show_sig' => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
66 67 'top_posting' => !empty($_POST['_top_posting']),
67 68 'strip_existing_sig' => isset($_POST['_strip_existing_sig']),

0 comments on commit 47ad83f

Please sign in to comment.
Something went wrong with that request. Please try again.