restoring globalization of text alignment vars.

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index d3385bb4069006252bc0c74dea033538d2659cce..bfdc58722cc080d7290b1e1875186bb37665d419 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -34,12 +34,12 @@ include_once(SM_PATH . 'class/template/template.class.php');
  * @return void
  */
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE, $frames = FALSE ) {
-    global $squirrelmail_language, $sTplDir;
+    global $squirrelmail_language, $sTplDir, $oErroHandler;
 
     if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
         global $base_uri;
     }
-    global $theme_css, $custom_css, $pageheader_sent, $theme, $theme_default,
+    global $theme_css, $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction,
         $default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize, $chosen_theme;
 
     /* add no cache headers here */
@@ -68,7 +68,8 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
         .'?themeid='.$used_theme
         .'&templateid='.basename($sTplDir)
         .(!empty($used_fontset) ? '&fontset='.$used_fontset : '')
-        .(!empty($used_fontsize) ? '&fontsize='.$used_fontsize : '')."\">\n";
+        .(!empty($used_fontsize) ? '&fontsize='.$used_fontsize : '')
+        .(!empty($text_direction) ? '&dir='.$text_direction : '')."\">\n";
 
 
     // load custom style sheet (deprecated)
@@ -112,6 +113,9 @@ ECHO;
 
     /* this is used to check elsewhere whether we should call this function */
     $pageheader_sent = TRUE;
+    if (isset($oErrorHandler)) {
+        $oErrorHander->HeaderSent();
+    }
 }
 
 /**
@@ -191,9 +195,9 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
     }
 
     if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
-        $sJsBlock = '<script src="'. $sTplDir. 'js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
+        $sJsBlock = '<script src="'. $sTplDir. 'js/default.js" type="text/javascript"></script>' ."\n";
         if ($sHeaderJs) {
-            $sJsBlock .= "\n<script language=\"JavaScript\" type=\"text/javascript\">" .
+            $sJsBlock .= "\n<script type=\"text/javascript\">" .
                         "\n<!--\n" .
                         $sHeaderJs . "\n\n// -->\n</script>\n";
         }
@@ -265,13 +269,13 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
      */
     if($javascript_on) {
         if ($sHeaderJs) {
-            $sJsBlock = "\n<script language=\"JavaScript\" type=\"text/javascript\">" .
+            $sJsBlock = "\n<script type=\"text/javascript\">" .
                         "\n<!--\n" .
                         $sHeaderJs . "\n\n// -->\n</script>\n";
         } else {
         $sJsBlock = '';
         }
-        $sJsBlock .= "\n" . '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
+        $sJsBlock .= "\n" . '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript"></script>' ."\n";
         displayHtmlHeader (_("Compose"), $sJsBlock);
     } else {
         /* javascript off */