added mailbox and id to functioncall formatBody

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 9410d947c4d882e558e4cb47ddc8de09822f44ff..20c6e451d27837a50418b30d2a2b21ae9d5f48f6 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -260,12 +260,12 @@ function SendMDN ( $recipient , $sender) {
 
 
 function ToggleMDNflag ( $set ) {
-    global $imapConnection, $passed_id, $mailbox, $uid;
+    global $imapConnection, $passed_id, $mailbox, $uid_support;
     sqimap_mailbox_select($imapConnection, $mailbox);
     $sg =  $set?'+':'-';
     $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
     $read = sqimap_run_command ($imapConnection, $cmd, true, $response, 
-                                $readmessage, $uid);
+                                $readmessage, $uid_support);
 }
 
 function ClearAttachments() {
@@ -523,7 +523,7 @@ $body = '';
     $ent_ar = findDisplayEntity($message, false);
     $i = 0;
     for ($i = 0; $i < count($ent_ar); $i++) {
-       $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i]);
+       $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
     }
 
 
@@ -786,13 +786,12 @@ echo '</small></td>' .
     ' </tr>';
 
 /** from **/
-echo html_tag( 'tr', "\n" .
-            html_tag( 'td', _("From:"), 'right', $color[0], 'valign="top"' ) .
-            html_tag( 'td',
-                '<b>' . $from_name . '</b>&nbsp;' . "\n" ,
-            'left', $color[0] )
-       ) . "\n";
-       do_hook("read_body_after_from");
+echo html_tag( 'tr') . "\n" .
+    html_tag( 'td', _("From:"), 'right', $color[0], 'valign="top"' ) .
+    html_tag( 'td', '', 'left', $color[0] ) .
+        '<b>' . $from_name . '</b>&nbsp;&nbsp;';
+   do_hook("read_body_after_from");
+echo "&nbsp;\n" . '</td></tr>';
 /** date **/
 echo html_tag( 'tr', "\n" .
             html_tag( 'td', _("Date:"), 'right', $color[0], 'valign="top"' ) .