From: philippe_mingo Date: Fri, 21 Jun 2002 20:43:29 +0000 (+0000) Subject: Bugfix X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=13cf639bb63317b98fcb5b607d9e84dbfac5e3a3 Bugfix git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2990 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/html.php b/functions/html.php index 72351c0c..e85ab2da 100644 --- a/functions/html.php +++ b/functions/html.php @@ -14,19 +14,19 @@ */ function html_tag( $tag, // Tag to output - $val = '', // Value between tags (if empty only start tag is output) + $val = '', // Value between tags (if empty only start tag is issued) $align = '', // Alignment $bgcolor = '', // Back color $xtra = '' ) { // Extra options - GLOBAL $languages, $language; + GLOBAL $languages, $squirrelmail_language; $align = strtolower( $align ); $dir = strtolower( $dir ); $tag = strtoupper( $tag ); - if ( isset( $languages[$language]['DIR']) ) { - $dir = $languages[$language]['DIR']; + if ( isset( $languages[$squirrelmail_language]['DIR']) ) { + $dir = $languages[$squirrelmail_language]['DIR']; } else { $dir = 'ltr'; } @@ -56,24 +56,24 @@ $alg = " ALIGN=\"$align\""; } - $ret = "<$tag"; + $ret = "<$tag"; - if ( $dir <> 'ltr' ) { - $ret .= " DIR=\"$dir\""; - } + if ( $dir <> 'ltr' ) { + $ret .= " DIR=\"$dir\""; + } - $ret .= "$bgc$alg"; + $ret .= "$bgc$alg"; - if ( $xtra <> '' ) { - $ret .= " $xtra"; - } - $ret .= '>'; + if ( $xtra <> '' ) { + $ret .= " $xtra"; + } + $ret .= '>'; - if ( $val <> '' ) { - $ret .= "$val"; - } + if ( $val <> '' ) { + $ret .= "$val"; + } return( $ret ); } -?> \ No newline at end of file +?> diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 0f7e74f7..15c5e7e9 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -586,15 +586,13 @@ $show_num) { if ($num_msgs == 0) { /* if there's no messages in this folder */ echo html_tag( 'tr', - html_tag( 'td', - "
" . - _("THIS FOLDER IS EMPTY") . - "
 ", - 'center', - $color[4], - 'COLSPAN="' . count($index_order) . '"' - ) - ); + html_tag( 'td', + "
" . _("THIS FOLDER IS EMPTY") . "
 ", + 'center', + $color[4], + 'COLSPAN="' . count($index_order) . '"' + ) + ); } elseif ($start_msg == $end_msg) { /* if there's only one message in the box, handle it differently. */