X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=8d5409d9f1cd8405a08f4802b91ec60252cb30ba;hb=2b9d3f0b226c885d7d0e3acfc8cb4080303849bd;hp=c60c0fd61478f20e2a36e911501d9b66614f3242;hpb=62c36fb6c78d9e4c3cb61038a107277d3a02cafd;p=squirrelmail.git

diff --git a/src/read_body.php b/src/read_body.php
index c60c0fd6..8d5409d9 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -23,7 +23,6 @@ require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'functions/url_parser.php');
 require_once(SM_PATH . 'functions/html.php');
 
-
 /**
  * Given an IMAP message id number, this will look it up in the cached
  * and sorted msgs array and return the index. Used for finding the next
@@ -457,12 +456,13 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
     }
     echo '<TABLE BGCOLOR="'.$color[9].'" WIDTH="100%" CELLPADDING="1"'.
          ' CELLSPACING="0" BORDER="0" ALIIGN="center">'."\n";
-    echo '<TR><TD HEIGHT="7" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR><TR><TD align=center>'."\n";
+    echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
+          $color[4].'"></TD></TR><TR><TD align=center>'."\n";
     echo $s;
     do_hook("read_body_header");
     formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color);
     echo '</TABLE>';
-    echo '</TD></TR><TR><TD HEIGHT="7" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR>'."\n";
+    echo '</TD></TR><TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR>'."\n";
     echo '</TABLE>';
 }
 
@@ -550,6 +550,32 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
         /* code for navigating through attached message/rfc822 messages */
         $url = set_url_var($PHP_SELF, 'passed_ent_id',0);
         $s .= '<a href="'.$url.'">'._("View Message").'</a>';
+        $entities     = array();
+        $entity_count = array();
+        $c = 0;
+
+        foreach($message->parent->entities as $ent) {
+	    if ($ent->type0 == 'message' && $ent->type1 == 'rfc822') {
+        	$c++;
+        	$entity_count[$c] = $ent->entity_id;
+        	$entities[$ent->entity_id] = $c;
+	    }
+        }
+        $prev_link = _("Previous");
+        $next_link = _("Next");
+        if($entities[$passed_ent_id] > 1) {
+            $prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1];
+            $prev_link   = '<a href="'
+                         . set_url_var($PHP_SELF, 'passed_ent_id', $prev_ent_id)
+                         . '">' . $prev_link . '</a>';
+        }
+        if($entities[$passed_ent_id] < $c) {
+            $next_ent_id = $entity_count[$entities[$passed_ent_id] + 1];
+            $next_link   = '<a href="'
+                         . set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id)
+                         . '">' . $next_link . '</a>';
+        }
+        $s .= $topbar_delimiter . $prev_link;
         $par_ent_id = $message->parent->entity_id;
         if ($par_ent_id) {
             $par_ent_id = substr($par_ent_id,0,-2);
@@ -557,6 +583,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
             $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
             $s .= '<a href="'.$url.'">'._("Up").'</a>';
         }
+        $s .= $topbar_delimiter . $next_link;
     }
 
     $s .= '</small></td>' . "\n" . '<td align="right" width="33%" nowrap><small>';
@@ -797,20 +824,24 @@ echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center" bor
 echo '      <tr><td>';
 echo '        <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
 echo '          <tr bgcolor="'.$color[4].'"><td>';
-echo '            <table cellpadding="5" cellspacing="0" border="0" align="center">';
-echo '              <tr>'. html_tag( 'td', '<br>'. $messagebody."\n", 'left').'</td>';
+echo '            <table cellpadding="1" cellspacing="5" align="left" border="0">';
+echo '              <tr>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
+                        . '</tr>';
 echo '            </table>';
 echo '          </td></tr>';      
 echo '        </table></td></tr>';
 echo '    </table>';
 echo '  </td></tr>';
 
+echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
+          $color[4].'"></TD></TR>'."\n";
+
 $attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
 if ($attachmentsdisplay) {
    echo '  <tr><td>';
    echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
    echo '     <tr><td>';
-   echo '       <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
+   echo '       <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
    echo '        <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
    echo '           <b>' . _("Attachments") . ':</b>';
    echo '        </td></tr>';
@@ -818,10 +849,11 @@ if ($attachmentsdisplay) {
    echo '          <table width="100%" cellpadding="2" cellspacing="2" align="center"'.' border="0" bgcolor="'.$color[0].'"><tr><td>';
    echo              $attachmentsdisplay;
    echo '          </td></tr></table>';
-   echo '        </table></td></tr>';
-   echo '       </table></td></tr>';
-   echo '    </table>';
+   echo '       </td></tr></table>';
+   echo '    </td></tr></table>';
    echo '  </td></tr>';
+   echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
+          $color[4].'"></TD></TR>';
 }
 echo '</table>';