fixed bug #429144 wrong number in text for trash

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 678606b174eb68bbca2d25e4459199ea9be3661b..a98fbe45b587d1359c8dc6cb9078b7f77e7108b4 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -374,9 +374,11 @@
 
       $Message = '';
       if ($startMessage < $endMessage) {
-         $Message = _("Viewing messages") .":<B>$startMessage</B> ". _("to") ." <B>$endMessage</B> ($numMessages " . _("total") . ")\n";
+         $Message = sprintf( _("Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"), $startMessage, $endMessage, $numMessages );
       } elseif ($startMessage == $endMessage) {
-         $Message = _("Viewing message") .":<B>$startMessage</B> ($numMessages " . _("total") . ")\n";
+         $Message = _("Viewing Message: <b>1</b> (1 total)");
+      } else {
+         $Message = '<br>';
       }
 
       if ($sort == 6) {
@@ -489,7 +491,12 @@
       }
 
       echo '</table>';
-      echo "<table bgcolor=\"$color[4]\" width=100%><tr ><td>$lMore$mMore$rMore</td><td align=right>$Message</td></tr></table>";
+      echo "<table bgcolor=\"$color[9]\" width=100% border=0 cellpadding=1 cellspacing=1>" .
+              "<tr BGCOLOR=\"$color[4]\">" .
+                 "<table width=100% BGCOLOR=\"$color[4]\" border=0 cellpadding=1 cellspacing=0><tr><td>$lMore$mMore$rMore</td>".
+                 "<td align=right>$Message</td></tr></table>".
+              "</tr>".
+           "</table>";
       /** End of message-list table */
 
       do_hook('mailbox_index_after');
@@ -512,9 +519,10 @@
       $urlMailbox = urlencode($mailbox);
 
       /** This is the beginning of the message list table.  It wraps around all messages */
-      echo '<TABLE WIDTH="100%" BORDER="0" CELLPADDING="2" CELLSPACING="0">';
+      echo "<center>$Message</center>" .
+           '<TABLE WIDTH="100%" BORDER="0" CELLPADDING="1" CELLSPACING="0">';
 
-      echo "<TR BGCOLOR=\"$color[4]\"><TD>";
+      echo "<TR BGCOLOR=\"$color[9]\"><TD>";
 
       echo  "<table bgcolor=\"$color[4]\" cellpadding=2".
            ' width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td>' .
@@ -523,7 +531,7 @@
       echo "</td></tr></table>\n</td></tr>";
 
       /** The delete and move options */
-      echo "<TR><TD BGCOLOR=\"$color[0]\">";
+      echo "<TD BGCOLOR=\"$color[0]\">";
 
       echo "\n<FORM name=messageList method=post action=\"$moveURL\">\n";
       echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n";
@@ -544,7 +552,7 @@
       for ($i = 0; $i < count($boxes); $i++) {
          if (!in_array("noselect", $boxes[$i]['flags'])) {
             $box = $boxes[$i]['unformatted'];
-            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
          }
       }
@@ -700,4 +708,4 @@
       return substr($subject, 0, $trim_val) . '...';
    }
 
-?>
\ No newline at end of file
+?>