Changeset 47ad83f in github

Timestamp:

Mar 2, 2010 8:08:12 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

3704b78

Parents:

d5ffb587

Message:

• Added force_7bit option to force MIME encoding of plain/text messages (#1486510)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (1 diff)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added force_7bit option to force MIME encoding of plain/text messages (#1486510)
 - Use case sensitive check when checking for default folders (#1486346)
 - Fix checking for new mail: now checks unseen count of inbox (#1485794)

config/main.inc.php.dist

@@ -473 +473 @@
 $rcmail_config['sig_above'] = FALSE;
 
+// Use MIME encoding (quoted-printable) for 8bit characters in message body
+$rcmail_config['force_7bit'] = FALSE;
+
 // end of config file
 ?>

program/localization/en_US/labels.inc

@@ -303 +303 @@
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Advanced options';
 $labels['focusonnewmessage'] = 'Focus browser window on new message';

program/localization/pl_PL/labels.inc

@@ -260 +260 @@
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (przestarzałe)';
+$labels['force7bit'] = 'UŌywaj kodowania MIME dla znaków 8-bitowych';
 $labels['advancedoptions'] = 'opcje zaawansowane';
 $labels['readwhendeleted'] = 'Podczas usuwania oznacz wiadomość jako przeczytanÄ

program/steps/mail/sendmail.inc

@@ -457 +457 @@
 // choose transfer encoding for plain/text body
 if (preg_match('/[^\x00-\x7F]/', $MAIL_MIME->getTXTBody()))
-  $transfer_encoding = '8bit';
+  $transfer_encoding = $RCMAIL->config->get('force_7bit') ? 'quoted-printable' : '8bit';
 else
   $transfer_encoding = '7bit';

program/steps/settings/func.inc

@@ -450 +450 @@
       );
     }
-    
+
+    if (!isset($no_override['force_7bit'])) {
+      $field_id = 'rcmfd_force_7bit';
+      $input_7bit = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['force_7bit'] = array(
+        'title' => html::label($field_id, Q(rcube_label('force7bit'))),
+        'content' => $input_7bit->show($config['force_7bit']?1:0),
+      );
+    }
+
     if (!isset($no_override['top_posting'])) {
       $field_id = 'rcmfd_top_posting';

program/steps/settings/save_prefs.inc

@@ -63 +63 @@
       '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,
+      'force_7bit'         => isset($_POST['_force_7bit']) ? TRUE : FALSE,
       'show_sig'           => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
       'top_posting'        => !empty($_POST['_top_posting']),