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 ea4dc071a0924f2009019e461edbd8188b22d8f9..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,7 +27,7 @@ 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, $oErroHandler;
+    global $squirrelmail_language, $sTplDir, $oErrorHandler, $oTemplate;
 
     if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
         global $base_uri;
@@ -64,14 +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 : '')
-        .(!empty($text_direction) ? '&amp;dir='.$text_direction : '')."\">\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";
@@ -96,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;
 
@@ -114,7 +108,7 @@ ECHO;
     /* this is used to check elsewhere whether we should call this function */
     $pageheader_sent = TRUE;
     if (isset($oErrorHandler)) {
-        $oErrorHander->HeaderSent();
+        $oErrorHandler->HeaderSent();
     }
 }
 
@@ -126,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\"";
     }
@@ -211,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' ) {
@@ -294,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