philippe_mingo 23 년 전
부모
커밋
fb54b07606
2개의 변경된 파일24개의 추가작업 그리고 26개의 파일을 삭제
  1. 17 17
      functions/html.php
  2. 7 9
      functions/mailbox_display.php

+ 17 - 17
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 );
     }
 
-?>
+?>

+ 7 - 9
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. */