X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=3445a319f8f9202fee4b8a41412d61fe119394e3;hp=510b4f56937c3e605bfd9cf30323cb660efe15de;hb=deb25c8f038fb468935c920c2c6f2c61b3e72ece;hpb=dd268e20666b3470933b645964c982ecf0de43a3
diff --git a/functions/page_header.php b/functions/page_header.php
index 510b4f56..3445a319 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -27,7 +27,7 @@ include_once(SM_PATH . 'functions/imap_mailbox.php');
* @return void
*/
function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE, $frames = FALSE ) {
- global $squirrelmail_language, $sTplDir, $oErrorHandler, $oTemplate;
+ global $squirrelmail_language, $sTemplateID, $oErrorHandler, $oTemplate;
if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
global $base_uri;
@@ -36,41 +36,54 @@ 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
- */
- $templatedir=basename($sTplDir);
- $oTemplate->assign('base_uri',$base_uri);
- $oTemplate->assign('templatedir',$templatedir);
- $oTemplate->assign('themeid',$used_theme);
- $oTemplate->display('stylelink.tpl');
- echo '\n";
- // load custom style sheet (deprecated)
- if ( ! empty($theme_css) ) {
- echo "\n";
+ /**
+ * Stylesheets are loaded in the following order:
+ * 1) All stylesheets provided by the template. Normally, these are
+ * stylsheets in $sTplDir/css/. This is accomplished by calling
+ * $oTemplate->fetch_standard_stylesheet_links().
+ * 2) An optional user-defined stylesheet. This is set in the Display
+ * Preferences.
+ * 3) src/style.php which sets some basic font prefs.
+ * 4) If we are dealing with an RTL language, we load rtl.css from the
+ * template set.
+ **/
+
+ // 1. Stylesheets from the template.
+ $header_tags .= $oTemplate->fetch_standard_stylesheet_links();
+
+ $aUserStyles = array();
+ // 2. Option user-defined stylesheet from preferences.
+// 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', '');
+ if (!empty($chosen_theme) && substr($chosen_theme, 0, 2) == 'u_') {
+ $aUserStyles[] = substr($chosen_theme, 2) .'default.css';
+ }
+
+ // 3. src/style.php
+ $aUserStyles[] = $base_uri .'src/style.php?'
+ . (!empty($used_fontset) ? '&fontset='.$used_fontset : '')
+ . (!empty($used_fontsize) ? '&fontsize='.$used_fontsize : '');
+ $header_tags .= $oTemplate->fetch_external_stylesheet_links($aUserStyles);
+
+ // 4. Optional rtl.css stylesheet
+ if ($text_direction == 'rtl') {
+ $header_tags .= $oTemplate->fetch_right_to_left_stylesheet_link();
}
if ($squirrelmail_language == 'ja_JP') {
@@ -81,17 +94,20 @@ 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)) {
$oErrorHandler->HeaderSent();
}
+
}
/**
@@ -144,6 +162,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);
}
@@ -181,8 +200,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)) {
@@ -190,7 +207,7 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
}
if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
- $js_includes = $oTemplate->getJavascriptIncludes();
+ $js_includes = $oTemplate->get_javascript_includes(TRUE);
$sJsBlock = '';
foreach ($js_includes as $js_file) {
$sJsBlock .= '' ."\n";
@@ -279,7 +296,7 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
}
$sJsBlock .= "\n";
- $js_includes = $oTemplate->getJavascriptIncludes();
+ $js_includes = $oTemplate->get_javascript_includes(TRUE);
foreach ($js_includes as $js_file) {
$sJsBlock .= '' ."\n";
}
@@ -290,5 +307,6 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
displayHtmlHeader(_("Compose"));
$onload = '';
}
+// FIXME: should let the template echo all these kinds of things
echo "\n\n";
}