X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=f0d129b2c151373c5968eb93f739fb969eb9edde;hp=bfdc58722cc080d7290b1e1875186bb37665d419;hb=b8292491d0c6526f3a39dca305f7283c23a1d137;hpb=f549a7069891846f86ee287bc3afd09f47fbf8b9
diff --git a/functions/page_header.php b/functions/page_header.php
index bfdc5872..f0d129b2 100644
--- 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 to
@@ -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, $sTemplateID, $oErrorHandler, $oTemplate;
if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
global $base_uri;
@@ -43,39 +36,40 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
$default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize, $chosen_theme;
/* add no cache headers here */
- header('Pragma: no-cache'); // http 1.0 (rfc1945)
- header('Cache-Control: private, no-cache, no-store'); // http 1.1 (rfc2616)
+//FIXME: should change all header() calls in SM core to use $oTemplate->header()!!
+ $oTemplate->header('Pragma: no-cache'); // http 1.0 (rfc1945)
+ $oTemplate->header('Cache-Control: private, no-cache, no-store'); // http 1.1 (rfc2616)
- if ($frames) {
- echo '';
- } else {
- echo '';
- }
- echo "\n" . html_tag( 'html' ,'' , '', '', 'lang="'.$squirrelmail_language.'"' ) .
- "\n\n";
+ $oTemplate->assign('frames', $frames);
+ $oTemplate->assign('lang', $squirrelmail_language);
+
+ $header_tags = '';
+
+ $header_tags .= "\n";
$used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset);
$used_fontsize = (!empty($chosen_fontsize) ? $chosen_fontsize : $default_fontsize);
$used_theme = basename((!empty($chosen_theme) ? $chosen_theme : $theme[$theme_default]['PATH']),'.php');
- /*
- * Add closing / to link and meta elements only after switching to xhtml 1.0 Transitional.
- * It is not compatible with html 4.01 Transitional
- */
- echo '\n";
-
-
+ $header_tags .= $oTemplate->fetch_standard_stylesheet_links();
+ $aUserStyles = array();
+//FIXME: remove this!!
// load custom style sheet (deprecated)
if ( ! empty($theme_css) ) {
- echo "\n";
+ $aUserStyles[] = $theme_css;
}
+// FIXME: the following user pref ("sUserStyle"; rename as necessary) will have to be populated by the display prefs screen from a widget similar to the color themes widget (which it replaces) where its values should be full relative paths (from SM_PATH) to the selected css "themes" (either in template css/alternates dir or SM_PATH/css/alternates dir)
+// FIXME: uhhh, getPref() is not available yet here. (at least on login page) Ugh. Nor has load_prefs been included yet -- how do we fix this?
+// $aUserStyles[] = getPref($data_dir, $username, 'sUserStyle', '');
+ $aUserStyles[] = $base_uri .'src/style.php'
+ . '?themeid='.$used_theme
+ . '&templateid='.$sTemplateID
+ . (!empty($used_fontset) ? '&fontset='.$used_fontset : '')
+ . (!empty($used_fontsize) ? '&fontsize='.$used_fontsize : '')
+ . (!empty($text_direction) ? '&dir='.$text_direction : '');
+ $header_tags .= $oTemplate->fetch_external_stylesheet_links($aUserStyles);
+//FIXME: only call the next method if language is right-to-left!
+ $header_tags .= $oTemplate->fetch_right_to_left_stylesheet_link();
if ($squirrelmail_language == 'ja_JP') {
/*
@@ -85,37 +79,40 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
* We might get rid of it, if we follow http://www.w3.org/TR/japanese-xml/
* recommendations and switch to unicode.
*/
- echo "\n";
- echo '' . "\n";
+ $header_tags .= "\n";
+ $header_tags .= '' . "\n";
}
if ($do_hook) {
+ // NOTE! plugins here must assign output to template
+ // and NOT echo anything directly!!
do_hook('generic_header');
}
- echo "$title\n$xtra\n";
+ $header_tags .= $xtra;
+ $oTemplate->assign('page_title', $title);
/* work around IE6's scrollbar bug */
- echo <<
+
-ECHO;
+EOS;
- echo "\n\n\n";
+ $oTemplate->assign('header_tags', $header_tags);
+ $oTemplate->display('protocol_header.tpl');
/* this is used to check elsewhere whether we should call this function */
$pageheader_sent = TRUE;
if (isset($oErrorHandler)) {
- $oErrorHander->HeaderSent();
+ $oErrorHandler->HeaderSent();
}
+
}
/**
@@ -126,7 +123,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\"";
}
@@ -149,6 +147,7 @@ function makeInternalLink($path, $text, $target='') {
* Same as makeInternalLink, but echoes it too
*/
function displayInternalLink($path, $text, $target='') {
+// FIXME: should let the template echo all these kinds of things
echo makeInternalLink($path, $text, $target);
}
@@ -186,8 +185,6 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
$urlMailbox = urlencode($mailbox);
$startMessage = (int)$startMessage;
- $sTplDir = $oTemplate->template_dir;
-
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
if (!isset($frame_top)) {
@@ -195,7 +192,11 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
}
if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
- $sJsBlock = '' ."\n";
+ $js_includes = $oTemplate->get_javascript_includes(TRUE);
+ $sJsBlock = '';
+ foreach ($js_includes as $js_file) {
+ $sJsBlock .= '' ."\n";
+ }
if ($sHeaderJs) {
$sJsBlock .= "\n