Correct me if I'm wrong (because oddly, this seemed to be working previously for...

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index d3385bb4069006252bc0c74dea033538d2659cce..5042302086889d84e6c3f4e742407e3400ba98d3 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -11,15 +11,8 @@
  * @package squirrelmail
  */
 
-/** @ignore */
-if (! defined('SM_PATH')) define('SM_PATH','../');
-
 /** Include required files from SM */
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/imap_mailbox.php');
-require_once(SM_PATH . 'functions/global.php');
-include_once(SM_PATH . 'class/template/template.class.php');
+include_once(SM_PATH . 'functions/imap_mailbox.php');
 
 /**
  * Output a SquirrelMail page header, from <!doctype> to </head>
@@ -34,12 +27,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, $oErrorHandler, $oTemplate;
 
     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 */
@@ -64,13 +57,17 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
      * Add closing / to link and meta elements only after switching to xhtml 1.0 Transitional.
      * It is not compatible with html 4.01 Transitional
      */
+    $templatedir=basename($sTplDir);
+    $oTemplate->assign('base_uri',$base_uri);
+    $oTemplate->assign('templatedir',$templatedir);
+    $oTemplate->assign('themeid',$used_theme);
+    $oTemplate->display('stylelink.tpl');
     echo '<link rel="stylesheet" type="text/css" href="'. $base_uri .'src/style.php'
         .'?themeid='.$used_theme
-        .'&amp;templateid='.basename($sTplDir)
-        .(!empty($used_fontset) ? '&amp;fontset='.$used_fontset : '')
-        .(!empty($used_fontsize) ? '&amp;fontsize='.$used_fontsize : '')."\">\n";
-
-
+        .'&templatedir='.$templatedir
+        .(!empty($used_fontset) ? '&fontset='.$used_fontset : '')
+        .(!empty($used_fontsize) ? '&fontsize='.$used_fontsize : '')
+        .(!empty($text_direction) ? '&dir='.$text_direction : '')."\">\n";
     // load custom style sheet (deprecated)
     if ( ! empty($theme_css) ) {
         echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$theme_css\">\n";
@@ -95,16 +92,14 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
 
     /* work around IE6's scrollbar bug */
     echo <<<ECHO
+<!--[if IE 6]>
 <style type="text/css">
-<!--
 /* avoid stupid IE6 bug with frames and scrollbars */
 body {
-    voice-family: "\"}\"";
-    voice-family: inherit;
     width: expression(document.documentElement.clientWidth - 30);
 }
--->
 </style>
+<![endif]-->
 
 ECHO;
 
@@ -112,6 +107,9 @@ ECHO;
 
     /* this is used to check elsewhere whether we should call this function */
     $pageheader_sent = TRUE;
+    if (isset($oErrorHandler)) {
+        $oErrorHandler->HeaderSent();
+    }
 }
 
 /**
@@ -122,7 +120,8 @@ ECHO;
  * @param string target the target frame for this link
  */
 function makeInternalLink($path, $text, $target='') {
-    sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
+    global $base_uri;
+//    sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
     if ($target != '') {
         $target = " target=\"$target\"";
     }
@@ -191,9 +190,13 @@ 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";
+        $js_includes = $oTemplate->getJavascriptIncludes();
+        $sJsBlock = '';
+        foreach ($js_includes as $js_file) {
+            $sJsBlock .= '<script src="'.$js_file.'" 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";
         }
@@ -203,7 +206,10 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
         displayHtmlHeader ('SquirrelMail');
         $sBodyTagJs = '';
     }
-
+    /*
+     * this explains the imap_mailbox.php dependency. We should instead store
+     * the selected mailbox in the session and fallback to the session var.
+     */
     $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
                 readShortMailboxName($mailbox, $delimiter)));
     if ( $shortBoxName == 'INBOX' ) {
@@ -244,7 +250,7 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
  */
 function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
-    global $reply_focus, $javascript_on, $action;
+    global $reply_focus, $javascript_on, $action, $oTemplate;
 
     if (empty($sBodyTagJs)) {
         if (strpos($action, 'reply') !== FALSE && $reply_focus) {
@@ -265,13 +271,19 @@ 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";
+
+        $js_includes = $oTemplate->getJavascriptIncludes();
+        foreach ($js_includes as $js_file) {
+            $sJsBlock .= '<script src="'.$js_file.'" type="text/javascript"></script>' ."\n";
+        }
+
         displayHtmlHeader (_("Compose"), $sJsBlock);
     } else {
         /* javascript off */
@@ -280,4 +292,3 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
     }
     echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $sBodyTagJs>\n\n";
 }
-?>
\ No newline at end of file