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 72351c0cb2893545ebc1681c93b430345163e748..e85ab2dad6a8783d730cfa1a4cfa092e225a1512 100644 (file)
--- 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</$tag>";
-           }
+       if ( $val <> '' ) {
+           $ret .= "$val</$tag>";
+       }
        
         return( $ret );
     }
 
-?>
\ No newline at end of file
+?>

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 0f7e74f736e0a5fa322eed879d4b30784d5da685..15c5e7e919594999e9d2fc991c8b92171d20c587 100644 (file)
--- 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',
-        "<BR><B>" .
-        _("THIS FOLDER IS EMPTY") .
-        "</B><BR>&nbsp;",
-        'center',
-        $color[4],
-        'COLSPAN="' . count($index_order) . '"'
-        )
-        );
+                html_tag( 'td',
+                          "<BR><B>" . _("THIS FOLDER IS EMPTY") . "</B><BR>&nbsp;",
+                          'center',
+                          $color[4],
+                          'COLSPAN="' . count($index_order) . '"'
+                )
+            );
 
     } elseif ($start_msg == $end_msg) {
         /* if there's only one message in the box, handle it differently. */