allow_call_time_pass_reference = Off

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 581cda397336bd1d549bb6ebaab2815f5123aa50..90a644bcc0c54baef9ac97aaec1cad7f99e05e33 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -445,7 +445,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
   mail_message_listing_beginning($imapConnection, $mailbox, $sort, 
                                   $msg_cnt_str, $paginator_str, $start_msg);
 
-
+  
   printHeader($mailbox, $srt, $color, !$thread_sort_messages);
 
   displayMessageArray($imapConnection, $num_msgs, $start_msg, 
@@ -594,7 +594,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
   $t = 0;
 
   /* messages display */
-  echo  html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1"  cellspacing="0"' );
+  
   if ($num_msgs == 0) {
     /* if there's no messages in this folder */
         echo html_tag( 'tr',
@@ -697,26 +697,27 @@ function mail_message_listing_beginning ($imapConnection,
         . html_tag( 'td' ,'' , 'left', $color[0], '' )
         . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="0"  cellspacing="0"' )
             . html_tag( 'tr',
-               getSmallStringCell(_("Move Selected To:"), 'left') .
+               getSmallStringCell(_("Move Selected To"), 'left') .
                getSmallStringCell(_("Transform Selected Messages"), 'right')
             )
             . html_tag( 'tr' ) ."\n"
             . html_tag( 'td', '', 'left', '', 'valign="middle" nowrap' );
             getMbxList($imapConnection);  
-            echo getButton('SUBMIT', 'moveButton',_("Move")) . ' '."\n";   
-            echo getButton('SUBMIT', 'attache',_("Forward")) . ' '."\n";   
+            echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n";   
+            echo getButton('SUBMIT', 'attache',_("Forward")) . "\n";   
 
   echo "      </TD>\n"
     . html_tag( 'td', '', 'right', '', 'nowrap' );
 
   if (!$auto_expunge) {
      echo getButton('SUBMIT', 'expungeButton',_("Expunge")) 
-          .'&nbsp;' . _("mailbox") . '&nbsp;'."\n";   
+          .'&nbsp;' . _("mailbox") . "\n";   
   }
   
-  echo getButton('SUBMIT', 'markRead',_("Read")) ."\n";   
-  echo getButton('SUBMIT', 'markUnread',_("Unread")) ."\n";   
-  echo getButton('SUBMIT', 'delete',_("Delete")) .'&nbsp;'."\n";
+  echo getButton('SUBMIT', 'markRead',_("Read"));
+  echo getButton('SUBMIT', 'markUnread',_("Unread"));
+  echo getButton('SUBMIT', 'delete',_("Delete")) ."&nbsp\n";
+  echo '<INPUT TYPE="HIDDEN" NAME="location" VALUE="'.$PHP_SELF.'">';
   echo "</TD>\n"
        . "   </TR>\n";
 
@@ -791,6 +792,7 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo
 
 function printHeader($mailbox, $sort, $color, $showsort=true) {
   global $index_order;
+    echo html_tag( 'table' ,'' , '', $color[9], 'border="0" width="100%" cellpadding="1"  cellspacing="1"' );
     echo html_tag( 'tr' ,'' , 'center', $color[5] );
     for ($i=1; $i <= count($index_order); $i++) {
         switch ($index_order[$i]) {
@@ -1216,7 +1218,7 @@ return '<INPUT TYPE="'.$type.'" NAME="'.$name.'" VALUE="'.$value . '">';
 
 function getSmallStringCell($string, $align) {
   return html_tag( 'td',            
-            '<small>' . $string . ': &nbsp; </small>',
+            '<small>' . $string . ':&nbsp; </small>',
             $align,
             '',
             'nowrap' );