X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=ce9b3d456717e08627c92608ce05bad4566f285b;hb=88f6f618ecbe146746c174660942131badc5aa39;hp=70d289aa0ce6cce2b22722ed487b3fde3a595b66;hpb=6373ad1237c82a561fec8264457e3a3a845f7e87;p=squirrelmail.git diff --git a/functions/page_header.php b/functions/page_header.php index 70d289aa..ce9b3d45 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,38 +36,51 @@ 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"; - - - // 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', ''); + + // 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') { @@ -85,37 +91,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 "