X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=27fa23a0ec91f7fc5ca3ec8a3d841f1bf70b684e;hb=769a819ddfb1917b473e2b36f86f7c5b99b14600;hp=d13bb825f0d65052910930f1ce2875d9733c2cc2;hpb=71db0ef9ee62aa14c4943be0f8107add8152eb2b;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index d13bb825..27fa23a0 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -27,50 +27,71 @@ 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;
}
- global $theme_css, $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction,
- $default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize, $chosen_theme;
+ global $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction,
+ $default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize,
+ $chosen_theme, $chosen_theme_path, $user_themes, $user_theme_default;
/* 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
+ $used_theme = !isset($chosen_theme) && $user_theme_default != 'none' && is_dir($chosen_theme) && is_readable($chosen_theme)? $user_themes[$user_theme_default]['PATH'].'/default.css' : $chosen_theme_path;
+
+ /**
+ * Stylesheets are loaded in the following order:
+ * 1) All stylesheets provided by the template. Normally, these are
+ * stylsheets in templates//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.
*/
- $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";
+
+ // 1. Stylesheets from the template.
+ $header_tags .= $oTemplate->fetch_standard_stylesheet_links();
+
+ $aUserStyles = array();
+
+ // 2. Option user-defined stylesheet from preferences.
+ if (!empty($used_theme)) {
+ /**
+ * All styles just point to a directory, so we need to include all .css
+ * files in that directory.
+ */
+ $styles = list_files($used_theme, '.css');
+ foreach ($styles as $sheet) {
+ $aUserStyles[] = $used_theme .'/'.$sheet;
+ }
+ }
+
+ // 3. src/style.php
+ $aUserStyles[] = $base_uri .'src/style.php?'
+ . (!empty($used_fontset) ? '&fontset='.$used_fontset : '')
+ . (!empty($used_fontsize) ? '&fontsize='.$used_fontsize : '');
+
+ // 3.1. Load the stylesheets we have already
+ $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 +102,21 @@ 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) {
- do_hook('generic_header');
+ // NOTE! plugins here must assign output to template
+ // and NOT echo anything directly!!
+ global $null;
+ do_hook('generic_header', $null);
}
- 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();
}
+
}
/**
@@ -120,11 +147,8 @@ ECHO;
* @param string target the target frame for this link
*/
function makeInternalLink($path, $text, $target='') {
- global $base_uri;
+ global $base_uri, $oTemplate;
// sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
- if ($target != '') {
- $target = " target=\"$target\"";
- }
// This is an inefficient hook and is only used by
// one plugin that still needs to patch this code,
@@ -133,17 +157,16 @@ function makeInternalLink($path, $text, $target='') {
// here just in case we find a good (non-visual?)
// use for the internal_link hook.
//
- //$hooktext = do_hook_function('internal_link',$text);
- //if ($hooktext != '')
- // $text = $hooktext;
+ //do_hook('internal_link', $text);
- return ''.$text.'';
+ return create_hyperlink($base_uri . $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 +204,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,8 +211,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);
+ $js_includes = $oTemplate->get_javascript_includes(TRUE);
$sJsBlock = '';
foreach ($js_includes as $js_file) {
$sJsBlock .= '' ."\n";
@@ -280,8 +300,7 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
}
$sJsBlock .= "\n";
- $js_includes = $oTemplate->getJavascriptIncludes();
- //$js_includes = $oTemplate->get_javascript_includes(TRUE);
+ $js_includes = $oTemplate->get_javascript_includes(TRUE);
foreach ($js_includes as $js_file) {
$sJsBlock .= '' ."\n";
}
@@ -292,5 +311,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";
}