Changeset 2731 in subversion

Timestamp:

Jul 10, 2009 10:52:11 AM (4 years ago)

Author:

thomasb

Message:

Fix compose step: correctly choose html mode and attachments when in draft or edit mode

Location:

trunk/roundcubemail

Files:

• program/steps/mail/compose.inc (modified) (7 diffs)
• skins/default/templates/compose.html (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -38 +38 @@
   rcmail_compose_cleanup();
   $_SESSION['compose'] = array(
-        'id' => uniqid(rand()),
-        'param' => array_map('strip_tags', $_GET),
-        'mailbox' => $IMAP->get_mailbox_name()
+    'id' => uniqid(rand()),
+    'param' => array_map('strip_tags', $_GET),
+    'mailbox' => $IMAP->get_mailbox_name(),
   );
   
@@ -87 +87 @@
   // similar as in program/steps/mail/show.inc
   // re-set 'prefer_html' to have possibility to use html part for compose
-  $CONFIG['prefer_html'] = $CONFIG['htmleditor'];
+  $CONFIG['prefer_html'] = $CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT;
   $MESSAGE = new rcube_message($msg_uid);
   
@@ -358 +358 @@
   $attrib['name'] = '_message';
 
-  if ($CONFIG['htmleditor'])
+  if ($CONFIG['htmleditor'] || (($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) && $MESSAGE->first_html_part()))
     $isHtml = true;
   else
@@ -563 +563 @@
       Q($MESSAGE->headers->date),
       htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()),
-        htmlspecialchars(Q($MESSAGE->get_header('to'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()));
+      htmlspecialchars(Q($MESSAGE->get_header('to'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()));
 
     if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
       $prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Reply-To: </th><td>%s</td></tr>",
-        htmlspecialchars(Q($MESSAGE->get_header('replyto'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()));
+        htmlspecialchars(Q($MESSAGE->get_header('replyto'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()));
 
     $prefix .= "</tbody></table><br>";
@@ -584 +584 @@
    * sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
    */
-  if (!isset($_SESSION['compose']['forward_attachments'])
+  if (empty($_SESSION['compose']['forward_attachments'])
       && is_array($MESSAGE->mime_parts)
       && count($MESSAGE->mime_parts) > 0)
@@ -606 +606 @@
   foreach ((array)$message->mime_parts as $pid => $part)
   {
-    if (($part->ctype_primary != 'message' || !$bodyIsHtml) && $part->filename &&
-        ($part->disposition=='attachment' || ($part->disposition=='inline' && $bodyIsHtml) || (empty($part->disposition))))
+    if (($part->ctype_primary != 'message' || !$bodyIsHtml) && $part->ctype_primary != 'multipart' && 
+        ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename))
     {
       if ($attachment = rcmail_save_attachment($message, $pid)) {
         $_SESSION['compose']['attachments'][$attachment['id']] = $attachment;
-        if ($bodyIsHtml && $part->filename && $part->content_id) {
+        if ($bodyIsHtml && $part->content_id) {
           $cid_map['cid:'.$part->content_id] = $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'];
         }
@@ -646 +646 @@
   
   $attachment = array(
-    'name' => $part->filename,
+    'name' => $part->filename ? $part->filename : 'Part_'.$pid.'.'.$part->ctype_secondary,
     'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
     'content_id' => $part->content_id,

trunk/roundcubemail/skins/default/templates/compose.html

@@ -69 +69 @@
                 <td class="title"><roundcube:label name="editortype" /></td>
                 <td>
-                    <div id="editor-select"><roundcube:object name="editorSelector" editorid="compose-body" tabindex="7" /></div>
+                    <div id="editor-select"><roundcube:object name="editorSelector" editorid="compose-body" /></div>
                     <div id="spellcheck-control"></div>
                 </td>
@@ -77 +77 @@
     </div>
     <div id="compose-div">
-        <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="8" />
+        <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" />
         <table border="0" cellspacing="0" summary="" style="width:100%; margin-top: 5px;"><tbody>
             <tr>