Hebrew step 2

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 3c412693200f800e502b12216387a4275a5506fc..13f185a37b5b08af6bdf10579da967d8d823c806 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -14,6 +14,7 @@
 
 require_once('../functions/strings.php');
 require_once('../functions/imap_utf7_decode_local.php');
+require_once('../functions/html.php');
 
 /* Default value for page_selector_max. */
 define('PG_SEL_MAX', 10);
@@ -605,11 +606,12 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
   }
   
   echo '</table>'
-    . "<table bgcolor=\"$color[9]\" width=\"100%\" border=0 cellpadding=1 "
-    . "cellspacing=1><tr BGCOLOR=\"$color[4]\"><td>"
+    . html_tag( 'table', '', 
+                "bgcolor=\"$color[9]\" width=\"100%\" border=0 cellpadding=1 cellspacing=1" ) 
+    . "<tr BGCOLOR=\"$color[4]\"><td>"
     . "<table width=\"100%\" BGCOLOR=\"$color[4]\" border=0 cellpadding=1 "
     . "cellspacing=0><tr><td>$paginator_str</td>"
-    . "<td align=right>$msg_cnt_str</td></tr></table>"
+    . html_tag( 'td', 'right' ) . "$msg_cnt_str</td></tr></table>"
     . "</td></tr></table>";
   /* End of message-list table */
   
@@ -674,8 +676,7 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
   foreach ($boxes as $boxes_part) {
     if (!in_array('noselect', $boxes_part['flags'])) {
       $box = $boxes_part['unformatted'];
-      $box2 = imap_utf7_decode_local(
-               str_replace(' ', '&nbsp;', $boxes_part['unformatted-disp']));
+      $box2 = str_replace(' ', '&nbsp;', imap_utf7_decode_local($boxes_part['unformatted-disp']));
       if( $box2 == 'INBOX' ) {
        $box2 = _("INBOX");
       }