rollback take 99

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3931 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/read_body.php b/src/read_body.php
index 77a53162cb9f8d7fd062a4a7b93db16750187df2..1ac417cf9a5dff0defba0ad8be66c9eea111bd1b 100644 (file)
--- 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
@@ -474,12 +473,9 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
 
     $topbar_delimiter = ' | ';
     $urlMailbox = urlencode($mailbox);
-    $sNav = $sCmp = '';
-    $sBar = '<table width="100%" cellpadding="3" cellspacing="4" align="center"'.
-         ' border="0" bgcolor="'.$color[9].'">';
-    $sBar .= '<tr><td align="right" width="15%" nowrap><small><b>'
-               ._("Navigation").':&nbsp;</small></b></td>';
-    $sBar .= '<td align="left" BGCOLOR="'.$color[0].'"><small>';
+    $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
+         ' border="0" bgcolor="'.$color[9].'"><tr><td align="left" width="33%"><small>';
+
     $msgs_url = $base_uri . 'src/';
     if (isset($where) && isset($what)) {
         $msgs_url .= 'search.php?where=' . urlencode($where) .
@@ -490,8 +486,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
                      $startMessage . '&amp;mailbox=' . $urlMailbox;
         $msgs_str  = _("Message List");
     }
-    $sNav = '<a href="' . $msgs_url . '">' . $msgs_str . '</a>';
-    $sNav .= $topbar_delimiter;
+    $s .= '<a href="' . $msgs_url . '">' . $msgs_str . '</a>';
+    $s .= $topbar_delimiter;
 
     $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
                   '&amp;message=' . $passed_id . '&amp;';
@@ -501,7 +497,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
         } else {
             $delete_url .= 'sort=' . $sort . '&amp;startMessage=' . $startMessage;
         }
-        $sNav .= '<a href="' . $delete_url . '">' . _("Delete") . '</a>';
+        $s .= '<a href="' . $delete_url . '">' . _("Delete") . '</a>';
     }
 
     $comp_uri = $base_uri . 'src/compose.php' .
@@ -524,12 +520,12 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
         $comp_alt_string = _("Edit Message as New");
     }
     if (isset($comp_alt_uri)) {
-        $sCmp .= $link_open . $comp_alt_uri . $link_close . $comp_alt_string . '</a>';
-       $sCmp .= $topbar_delimiter;     
+        $s .= $topbar_delimiter;
+        $s .= $link_open . $comp_alt_uri . $link_close . $comp_alt_string . '</a>';
     }
 
-//    $sNav .= '</small></td><td align="center"><small>';
-    $sNav .= '&nbsp;&nbsp;&nbsp;&nbsp;';
+    $s .= '</small></td><td align="center" width="33%"><small>';
+
     if (!(isset($where) && isset($what)) && !$passed_ent_id) {
         $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
         $next = findNextMessage($passed_id);
@@ -537,23 +533,23 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
             $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
                    '&amp;mailbox='.$urlMailbox.'&amp;sort='.$sort.
                    '&amp;startMessage='.$startMessage.'&amp;show_more=0';
-            $sNav .= '<a href="'.$uri.'">'._("Previous").'</a>';       
+            $s .= '<a href="'.$uri.'">'._("Previous").'</a>';       
         } else {
-            $sNav .= _("Previous");
+            $s .= _("Previous");
         }
-        $sNav .= $topbar_delimiter;
+        $s .= $topbar_delimiter;
         if ($next != -1) {
             $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
                    '&amp;mailbox='.$urlMailbox.'&amp;sort='.$sort.
                    '&amp;startMessage='.$startMessage.'&amp;show_more=0';
-            $sNav .= '<a href="'.$uri.'">'._("Next").'</a>';
+            $s .= '<a href="'.$uri.'">'._("Next").'</a>';
         } else {
-            $sNav .= _("Next");
+            $s .= _("Next");
         }
     } else if (isset($passed_ent_id) && $passed_ent_id) {
         /* code for navigating through attached message/rfc822 messages */
         $url = set_url_var($PHP_SELF, 'passed_ent_id',0);
-        $sNav .= '<a href="'.$url.'">'._("View Message").'</a>';
+        $s .= '<a href="'.$url.'">'._("View Message").'</a>';
         $entities     = array();
         $entity_count = array();
         $c = 0;
@@ -576,42 +572,37 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
                          . set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id)
                          . '">' . $next_link . '</a>';
         }
-        $sNav .= $topbar_delimiter . $prev_link;
+        $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);
-            $sNav .= $topbar_delimiter;
+            $s .= $topbar_delimiter;
             $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
-            $sNav .= '<a href="'.$url.'">'._("Up").'</a>';
+            $s .= '<a href="'.$url.'">'._("Up").'</a>';
         }
-       $sNav .= $topbar_delimiter . $next_link;
-
+        $s .= $topbar_delimiter . $next_link;
     }
-    $sBar .= $sNav . '</small></td></tr>' . "\n"; 
-    $sBar .= '<tr><td align="right" width="15%" nowrap><small><b>'
-               ._("Compose").':&nbsp;</small></b></td>';
-    $sBar .= '<td align="left" BGCOLOR="'.$color[0].'"><small>';
 
+    $s .= '</small></td>' . "\n" . '<td align="right" width="33%" nowrap><small>';
     $comp_action_uri = $comp_uri . '&amp;action=forward';
-    $sCmp .= $link_open . $comp_action_uri . $link_close . _("Forward") . '</a>';
-    $sCmp .= $topbar_delimiter;
+    $s .= $link_open . $comp_action_uri . $link_close . _("Forward") . '</a>';
+    $s .= $topbar_delimiter;
 
     if ($enable_forward_as_attachment) {
         $comp_action_uri = $comp_uri . '&amp;action=forward_as_attachment';
-        $sCmp .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '</a>';
-        $sCmp .= $topbar_delimiter;
+        $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '</a>';
+        $s .= $topbar_delimiter;
     }
 
     $comp_action_uri = decodeHeader($comp_uri . '&amp;action=reply');
-    $sCmp .= $link_open . $comp_action_uri . $link_close . _("Reply") . '</a>';
-    $sCmp .= $topbar_delimiter;
+    $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . '</a>';
+    $s .= $topbar_delimiter;
 
     $comp_action_uri = $comp_uri . '&amp;action=reply_all';
-    $sCmp .= $link_open . $comp_action_uri . $link_close . _("Reply All") . '</a>';
-
-    $sBar .= $sCmp .'</small></td></tr></table>';
+    $s .= $link_open . $comp_action_uri . $link_close . _("Reply All") . '</a>';
+    $s .= '</small></td></tr></table>';
     do_hook("read_body_menu_top");
-    echo $sBar;
+    echo $s;
     do_hook("read_body_menu_bottom");
 }
 
@@ -680,10 +671,6 @@ if (isset($_GET['startMessage'])) {
 elseif (isset($_POST['startMessage'])) {
     $startMessage = $_POST['startMessage'];
 }
-if (isset($_GET['view_unsafe_images'])) {
-    $view_unsafe_images = $_GET['view_unsafe_images'];
-}
-
 if (isset($_GET['show_more'])) {
     $show_more = $_GET['show_more'];
 }
@@ -824,7 +811,7 @@ for ($i = 0; $i < $cnt; $i++) {
        $messagebody .= '<hr noshade size=1>';
    }
 }
-echo '<table>';
+
 displayPageHeader($color, $mailbox);
 formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
 formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
@@ -859,13 +846,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>';
 }
-echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
-          $color[4].'"></TD></TR><TR><TD align=center>'."\n";
-
 echo '</table>';
 
 /* show attached images inline -- if pref'fed so */
@@ -894,7 +879,7 @@ sqimap_logout($imapConnection);
 /* sessions are written at the end of the script. it's better to register 
    them at the end so we avoid double session_register calls */
 sqsession_register($messages,'messages');
-echo '</table>';
+
 ?>
 </body>
 </html>