Changeset 868deb5 in github

Timestamp:

Oct 6, 2010 1:15:38 PM (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:

7f89041

Parents:

ace511a

Message:

• Make htmleditor option behaviour consistent, add option to use HTML on reply to HTML message (#1485840)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• installer/config.php (modified) (2 diffs)
• program/include/rcube_message.php (modified) (4 diffs)
• program/steps/mail/compose.inc (modified) (5 diffs)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

CHANGELOG

@@ -20 +20 @@
 - Improve tabs to fixed width and add tabs in identities info (#1486974)
 - Add unique index on users.username+users.mail_host
+- Make htmleditor option more consistent and add option to use HTML on reply to HTML message (#1485840)
 
 RELEASE 0.4.2

config/main.inc.php.dist

@@ -480 +480 @@
 
 // compose html formatted messages by default
-$rcmail_config['htmleditor'] = false;
+// 0 - never, 1 - always, 2 - on reply to HTML message only 
+$rcmail_config['htmleditor'] = 0;
 
 // show pretty dates as standard

installer/config.php

@@ -15 +15 @@
   'prefer_html' => 1,
   'preview_pane' => 1,
-  'htmleditor' => 1,
   'debug_level' => 1,
 );
@@ -544 +543 @@
 <dt class="propname">htmleditor <span class="userconf">*</span></dt>
 <dd>
-<?php
-
-$check_htmlcomp = new html_checkbox(array('name' => '_htmleditor', 'id' => "cfghtmlcompose", 'value' => 1));
-echo $check_htmlcomp->show(intval($RCI->getprop('htmleditor')));
-
-?>
-<label for="cfghtmlcompose">Compose HTML formatted messages</label><br />
+<label for="cfghtmlcompose">Compose HTML formatted messages</label>
+<?php
+
+$select_htmlcomp = new html_select(array('name' => '_htmleditor', 'id' => "cfghtmlcompose"));
+$select_htmlcomp->add('never', 0);
+$select_htmlcomp->add('always', 1);
+$select_htmlcomp->add('on reply to HTML message only', 2);
+echo $select_htmlcomp->show(intval($RCI->getprop('htmleditor')));
+
+?>
 </dd>
 

program/include/rcube_message.php

@@ -215 +215 @@
      * Return the first text part of this message
      *
+     * @param rcube_message_part $part Reference to the part if found
      * @return string Plain text message/part content
      */
-    function first_text_part()
+    function first_text_part(&$part=null)
     {
         // no message structure, return complete body
@@ -223 +224 @@
             return $this->body;
 
-        $out = null;
-
         // check all message parts
         foreach ($this->mime_parts as $mime_id => $part) {
@@ -230 +229 @@
 
             if ($mimetype == 'text/plain') {
-                $out = $this->imap->get_message_part($this->uid, $mime_id, $part);
-
-                // re-format format=flowed content
-                if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed')
-                    $out = self::unfold_flowed($out);
-                break;
+                return $this->imap->get_message_part($this->uid, $mime_id, $part);
             }
             else if ($mimetype == 'text/html') {
@@ -246 +240 @@
                 // create instance of html2text class
                 $txt = new html2text($out);
-                $out = $txt->get_text();
-            }
-        }
-
-        return $out;
+                return $txt->get_text();
+            }
+        }
+
+        $part = null;
+        return null;
     }
 

program/steps/mail/compose.inc

@@ -359 +359 @@
   }
 
-
   if ($fname && $field_type)
   {
@@ -492 +491 @@
 
 
+function rcmail_compose_editor_mode()
+{
+  global $RCMAIL, $MESSAGE, $compose_mode;
+  static $useHtml;
+
+  if ($useHtml !== null)
+    return $useHtml;
+
+  $html_editor = intval($RCMAIL->config->get('htmleditor'));
+
+  if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) {
+    $useHtml = $MESSAGE->has_html_part();
+  }
+  else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
+    $useHtml = ($html_editor == 1 || ($html_editor == 2 && $MESSAGE->has_html_part()));
+  }
+  else { // RCUBE_COMPOSE_FORWARD or NEW
+    $useHtml = ($html_editor == 1);
+  }
+
+  return $useHtml;
+}
+
+
 function rcmail_prepare_message_body()
 {
-  global $RCMAIL, $CONFIG, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE;
-
-  if ($CONFIG['htmleditor'] || (($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) && $MESSAGE->has_html_part()))
-    $isHtml = true;
-  else
-    $isHtml = false;
-
-  $body = '';
+  global $RCMAIL, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE;
 
   // use posted message body
-  if (!empty($_POST['_message']))
-  {
+  if (!empty($_POST['_message'])) {
     $body = get_input_value('_message', RCUBE_INPUT_POST, true);
-  }
-  else if ($_SESSION['compose']['param']['body'])
-  {
+    $isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
+  }
+  else if ($_SESSION['compose']['param']['body']) {
     $body = $_SESSION['compose']['param']['body'];
     $isHtml = false;
   }
-  else if ($compose_mode)
-  {
+  // reply/edit/draft/forward
+  else if ($compose_mode) {
     $has_html_part = $MESSAGE->has_html_part();
-    if (($isHtml || $compose_mode == RCUBE_COMPOSE_DRAFT) && $has_html_part)
-    {
-      $body = $MESSAGE->first_html_part();
-      $isHtml = true;
-    }
-    else if ($has_html_part)
-    {
-      // use html part if it has been used for message (pre)viewing
-      // decrease line length for quoting
-      $len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
-      $txt = new html2text($MESSAGE->first_html_part(), false, true, $len);
-      $body = $txt->get_text();
-      $isHtml = false;
-    }
-    else
-    {
-      $body = $MESSAGE->first_text_part();
-      $isHtml = false;
+    $isHtml = rcmail_compose_editor_mode();
+
+    if ($isHtml) {
+      if ($has_html_part) {
+        $body = $MESSAGE->first_html_part();
+      }
+      else {
+        $body = rcmail_plain_body($MESSAGE->first_text_part());
+        if ($body)
+          $body = '<pre>' . $body . '</pre>';
+      }
+    }
+    else {
+      if ($has_html_part) {
+        // use html part if it has been used for message (pre)viewing
+        // decrease line length for quoting
+        $len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
+        $txt = new html2text($MESSAGE->first_html_part(), false, true, $len);
+        $body = $txt->get_text();
+      }
+      else {
+        $body = $MESSAGE->first_text_part($part);
+        if ($body && $part && $part->ctype_secondary == 'plain'
+            && $part->ctype_parameters['format'] == 'flowed'
+        ) {
+          $body = rcube_message::unfold_flowed($body);
+        }
+      }
     }
 
@@ -545 +570 @@
     else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT)
       $body = rcmail_create_draft_body($body, $isHtml);
+  }
+  else { // new message
+    $isHtml = rcmail_compose_editor_mode();
   }
 
@@ -1152 +1180 @@
 
   // determine whether HTML or plain text should be checked
-  if ($compose_mode)
-    $useHtml = (($CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT)
-        && $MESSAGE->has_html_part());
-  else
-    $useHtml = $CONFIG['htmleditor'] ? true : false;
+  $useHtml = rcmail_compose_editor_mode();
 
   if (empty($attrib['editorid']))
@@ -1173 +1197 @@
   return $select->show($useHtml ? 'html' : 'plain');
 
-  foreach ($choices as $value => $text)
-  {
+  foreach ($choices as $value => $text) {
     $attrib['id'] = '_' . $value;
     $attrib['value'] = $value;

program/steps/settings/func.inc

@@ -467 +467 @@
     if (!isset($no_override['htmleditor'])) {
       $field_id = 'rcmfd_htmleditor';
-      $input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
+      $select_htmleditor = new html_select(array('name' => '_htmleditor', 'id' => $field_id));
+      $select_htmleditor->add(rcube_label('never'), 0);
+      $select_htmleditor->add(rcube_label('always'), 1);
+      $select_htmleditor->add(rcube_label('htmlonreply'), 2);
 
       $blocks['main']['options']['htmleditor'] = array(
         'title' => html::label($field_id, Q(rcube_label('htmleditor'))),
-        'content' => $input_htmleditor->show($config['htmleditor']?1:0),
+        'content' => $select_htmleditor->show(intval($config['htmleditor'])),
       );
     }

program/steps/settings/save_prefs.inc

@@ -59 +59 @@
     );
 
-
   break;
   case 'compose':
     $a_user_prefs = array(
-      'htmleditor'         => isset($_POST['_htmleditor']) ? TRUE : FALSE,
+      'htmleditor'         => intval($_POST['_htmleditor']),
       '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,