fix for bug #596930

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 1d09812c6bc8276417cefdf8f22d77ce125e11d2..9ffb30e5a4b794743a126ac303616ee867b0f978 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 || 
-                    $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";
@@ -364,14 +366,13 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
       }                 
    }
 
-/* BOOKMARK */
    $s  = '<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0"';
    $s .=       ' ALIGN="center" BGCOLOR="' . $color[0] . '">';
    foreach ($env as $key => $val) {
      if ($val) {      
         $s .= '<TR>';
-        $s .=   html_tag('TD', '<B>' . $key . ':&nbsp;&nbsp;</B>', 'RIGHT', '', 'VALIGN="MIDDLE" WIDTH="20%"') . "\n";
-        $s .=   html_tag('TD', $val, 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"') . "\n";
+        $s .=   html_tag('TD', '<B>' . $key . ':&nbsp;&nbsp;</B>', 'RIGHT', '', 'VALIGN="TOP" WIDTH="20%"') . "\n";
+        $s .=   html_tag('TD', $val, 'left', '', 'VALIGN="TOP" WIDTH="80%"') . "\n";
         $s .= '</TR>';
      }
    }
@@ -484,9 +485,9 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
    $comp_action_uri = $comp_uri . '&amp;action=forward_as_attachment';
    if ($compose_new_win == '1') {
       $s .= '<a href="javascript:void(0)" '. 
-            'onclick="comp_in_new(\''.$comp_action_uri.'\')">'._("Forward as attachment").'</a>';
+            'onclick="comp_in_new(\''.$comp_action_uri.'\')">'._("Forward as Attachment").'</a>';
    } else {
-      $s .= '<a href="'.$comp_action_uri.'">'._("Forward as attachment").'</a>';
+      $s .= '<a href="'.$comp_action_uri.'">'._("Forward as Attachment").'</a>';
    }
    $s .= $topbar_delimiter;
 
@@ -518,9 +519,8 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
    $urlMailbox = urlencode($mailbox);
    $url = $base_uri.'src/view_header.php?'.$QUERY_STRING;
 
-/* BOOKMARK */
    $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>';
 
@@ -584,10 +584,12 @@ $FirstTimeSee = !$message->is_seen;
 $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->id = $passed_id;
-   $message->mailbox = $mailbox;
+   $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;
 }
@@ -661,7 +663,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="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>';