download related fixes

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 99e14d59165497de81cf8cd72ac0bf74cd2ac39e..3f6b132de199bf166b3f68f390200f5778a1eb88 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -340,7 +340,9 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
              $env[_("Read receipt")] = _("send");
           } else {
              if ( !($mailbox == $draft_folder || 
              $env[_("Read receipt")] = _("send");
           } else {
              if ( !($mailbox == $draft_folder || 

-                    $mailbox == $sent_folder  || $message->is_deleted)) {
+                    $mailbox == $sent_folder  || 
+                    $message->is_deleted ||
+                    $passed_ent_id)) {

                $mdn_url = $PHP_SELF . '&sendreceipt=1';
                if ($FirstTimeSee && $javascript_on) {
                   $script  = '<script language="JavaScript" type="text/javascript">' ."\n";
                $mdn_url = $PHP_SELF . '&sendreceipt=1';
                if ($FirstTimeSee && $javascript_on) {
                   $script  = '<script language="JavaScript" type="text/javascript">' ."\n";


@@ -518,7 +520,7 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
    $url = $base_uri.'src/view_header.php?'.$QUERY_STRING;
 
    $s  = "<TR>\n";
    $url = $base_uri.'src/view_header.php?'.$QUERY_STRING;
 
    $s  = "<TR>\n";

-   $s .= '<TD VALIGN="MIDDLE" ALIGN="RIGHT" WIDTH="20%"><B>' . _("Other") . ":&nbsp;&nbsp;</B></TD>\n";
+   $s .= '<TD VALIGN="MIDDLE" ALIGN="RIGHT" WIDTH="20%"><B>' . _("Options") . ":&nbsp;&nbsp;</B></TD>\n";

    $s .= '<TD VALIGN="MIDDLE" ALIGN="LEFT" WIDTH="80%"><SMALL>';
    $s .= '<a href="'.$url.'">'.("View Full Header").'</a>';
 
    $s .= '<TD VALIGN="MIDDLE" ALIGN="LEFT" WIDTH="80%"><SMALL>';
    $s .= '<a href="'.$url.'">'.("View Full Header").'</a>';
 


@@ -582,10 +584,15 @@ $FirstTimeSee = !$message->is_seen;
 $message->is_seen = true;
 $messages[$uidvalidity][$passed_id] = $message;
 
 $message->is_seen = true;
 $messages[$uidvalidity][$passed_id] = $message;
 

-if (isset($passed_ent_id)) {
+if (isset($passed_ent_id) && $passed_ent_id) {

    $message = $message->getEntity($passed_ent_id);
    $message = $message->getEntity($passed_ent_id);

-   $message->id = $passed_id;
-   $message->mailbox = $mailbox;
+   if ($message->type0 != 'message'  && $message->type1 != 'rfc822') {
+      $message = $message->parent;
+   }
+   $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, $uid_support);
+   $rfc822_header = new rfc822_header();
+   $rfc822_header->parseHeader($read);
+   $message->rfc822_header = $rfc822_header;

 } else {
    $passed_ent_id = 0;
 }
 } else {
    $passed_ent_id = 0;
 }


@@ -659,7 +666,7 @@ if ($attachmentsdisplay) {
    echo '      <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
    echo '         <tr><td ALIGN="left" bgcolor="'.$color[9].'"><b>';
    echo           _("Attachments").':</b></td></tr><tr><td>';
    echo '      <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
    echo '         <tr><td ALIGN="left" bgcolor="'.$color[9].'"><b>';
    echo           _("Attachments").':</b></td></tr><tr><td>';

-   echo '          <table width="100%" cellpadding="2" cellspacing="2" align="center"'.' border="0" bgcolor="'.$color[12].'">';
+   echo '          <table width="100%" cellpadding="2" cellspacing="2" align="center"'.' border="0" bgcolor="'.$color[0].'">';

    echo             $attachmentsdisplay;
    echo '         </td></tr></table></table></td></tr>';
    echo '      </table></td></tr>';
    echo             $attachmentsdisplay;
    echo '         </td></tr></table></table></td></tr>';
    echo '      </table></td></tr>';


@@ -677,7 +684,7 @@ if (($attachment_common_show_images) &&
                 '?' .
                 'passed_id='     . urlencode($img['passed_id']) .
                 '&amp;mailbox='       . urlencode($mailbox) .
                 '?' .
                 'passed_id='     . urlencode($img['passed_id']) .
                 '&amp;mailbox='       . urlencode($mailbox) .

-                '&amp;passed_ent_id=' . urlencode($img['ent_id']) .
+                '&amp;ent_id=' . urlencode($img['ent_id']) .

                 '&amp;absolute_dl=true';
 
         echo html_tag( 'table', "\n" .
                 '&amp;absolute_dl=true';
 
         echo html_tag( 'table', "\n" .