X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=f0d129b2c151373c5968eb93f739fb969eb9edde;hp=a7812b526b77302c2998cbe4c26fbbcf0bd5ad6d;hb=b8292491d0c6526f3a39dca305f7283c23a1d137;hpb=10bf80c009d938fc0cf85a70d0a6b3834365b146
diff --git a/functions/page_header.php b/functions/page_header.php
index a7812b52..f0d129b2 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -5,58 +5,71 @@
*
* Prints the page header (duh)
*
- * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @copyright © 1999-2006 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
/** 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 . 'functions/imap_mailbox.php');
/**
* Output a SquirrelMail page header, from to
* Always set up the language before calling these functions.
*
+ * Since 1.5.1 function sends http headers. Function should be called
+ * before any output is started.
* @param string title the page title, default SquirrelMail.
* @param string xtra extra HTML to insert into the header
* @param bool do_hook whether to execute hooks, default true
* @param bool frames generate html frameset doctype (since 1.5.1)
* @return void
*/
-function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true, $frames = false ) {
- global $squirrelmail_language;
+function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE, $frames = FALSE ) {
+ global $squirrelmail_language, $sTemplateID, $oErrorHandler, $oTemplate;
if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
global $base_uri;
}
- global $theme_css, $custom_css, $pageheader_sent;
+ global $theme_css, $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction,
+ $default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize, $chosen_theme;
- if ($frames) {
- echo '';
- } else {
- echo '';
- }
- echo "\n" . html_tag( 'html' ,'' , '', '', 'lang="'.$squirrelmail_language.'"' ) .
- "\n\n";
+ /* add no cache headers here */
+//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)
- /*
- * Add closing / to link and meta elements only after switching to xhtml 1.0 Transitional.
- * It is not compatible with html 4.01 Transitional
- */
- if ( !isset( $custom_css ) || $custom_css == 'none' ) {
- if ($theme_css != '') {
- echo "";
- }
- } else {
- echo '';
- }
+ $oTemplate->assign('frames', $frames);
+ $oTemplate->assign('lang', $squirrelmail_language);
+
+ $header_tags = '';
- echo '';
+ $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');
+
+ $header_tags .= $oTemplate->fetch_standard_stylesheet_links();
+ $aUserStyles = array();
+//FIXME: remove this!!
+ // load custom style sheet (deprecated)
+ if ( ! empty($theme_css) ) {
+ $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') {
/*
@@ -66,34 +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)) {
+ $oErrorHandler->HeaderSent();
+ }
+
}
/**
@@ -104,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\"";
}
@@ -127,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);
}
@@ -145,22 +166,24 @@ function displayInternalLink($path, $text, $target='') {
function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
global $reply_focus, $hide_sm_attributions, $frame_top,
- $provider_name, $provider_uri, $startMessage,
- $javascript_on, $action;
+ $provider_name, $provider_uri, $startMessage,
+ $javascript_on, $action, $oTemplate;
if (empty($sBodyTagJs)) {
if (strpos($action, 'reply') !== FALSE && $reply_focus) {
- if ($reply_focus == 'select')
- $sBodyTagJs = 'onload="checkForm(\'select\');"';
- else if ($reply_focus == 'focus')
- $sBodyTagJs = 'onload="checkForm(\'focus\');"';
- else if ($reply_focus != 'none')
- $sBodyTagJs = 'onload="checkForm();"';
+ if ($reply_focus == 'select')
+ $sBodyTagJs = 'onload="checkForm(\'select\');"';
+ else if ($reply_focus == 'focus')
+ $sBodyTagJs = 'onload="checkForm(\'focus\');"';
+ else if ($reply_focus != 'none')
+ $sBodyTagJs = 'onload="checkForm();"';
}
else
- $sBodyTagJs = 'onload="checkForm();"';
+ $sBodyTagJs = 'onload="checkForm();"';
}
+ $urlMailbox = urlencode($mailbox);
+ $startMessage = (int)$startMessage;
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
@@ -169,78 +192,52 @@ 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\n";
}
displayHtmlHeader ('SquirrelMail', $sJsBlock);
- } else {
+ } else {
/* do not use JavaScript */
displayHtmlHeader ('SquirrelMail');
$sBodyTagJs = '';
}
-
- echo "\n\n";
-
- /** Here is the header and wrapping table **/
+ /*
+ * 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' ) {
$shortBoxName = _("INBOX");
}
- echo "\n"
- . html_tag( 'table', '', '', $color[4], 'border="0" width="100%" cellspacing="0" cellpadding="2"' ) ."\n"
- . html_tag( 'tr', '', '', $color[9] ) ."\n"
- . html_tag( 'td', '', 'left' ) ."\n";
- if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) {
- echo ' ' . _("Current Folder") . ": $shortBoxName \n";
- } else {
- echo ' ';
- }
- echo " \n"
- . html_tag( 'td', '', 'right' ) ."\n";
- displayInternalLink ('src/signout.php', _("Sign Out"), $frame_top);
- echo "\n"
- . " \n"
- . html_tag( 'tr', '', '', $color[4] ) ."\n"
- . ($hide_sm_attributions ? html_tag( 'td', '', 'left', '', 'colspan="2"' )
- : html_tag( 'td', '', 'left' ) )
- . "\n";
- $urlMailbox = urlencode($mailbox);
- $startMessage = (int)$startMessage;
- echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox.'&startMessage='.$startMessage);
- echo " \n";
- displayInternalLink ('src/addressbook.php', _("Addresses"));
- echo " \n";
- displayInternalLink ('src/folders.php', _("Folders"));
- echo " \n";
- displayInternalLink ('src/options.php', _("Options"));
- echo " \n";
- displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"));
- echo " \n";
- displayInternalLink ('src/help.php', _("Help"));
- echo " \n";
-
- do_hook('menuline');
-
- echo " \n";
-
- if (!$hide_sm_attributions)
- {
- echo html_tag( 'td', '', 'right' ) ."\n";
+ $sm_attributes = '';
+ if (!$hide_sm_attributions) {
+ $sm_attributes .= '| ' ."\n";
if (empty($provider_uri)) {
- echo 'SquirrelMail';
+ $sm_attributes .= ' SquirrelMail';
} else {
if (empty($provider_name)) $provider_name= 'SquirrelMail';
- echo ''.$provider_name.'';
+ $sm_attributes .= ' '.$provider_name.''."\n";
}
- echo " | \n";
+ $sm_attributes .= " \n";
}
- echo " \n".
- "
\n\n";
+
+ $oTemplate->assign('body_tag_js', $sBodyTagJs);
+ $oTemplate->assign('shortBoxName', $shortBoxName);
+ $oTemplate->assign('sm_attribute_str', $sm_attributes);
+ $oTemplate->assign('frame_top', $frame_top);
+ $oTemplate->assign('urlMailbox', $urlMailbox);
+ $oTemplate->assign('startMessage', $startMessage);
+ $oTemplate->assign('hide_sm_attributions', $hide_sm_attributions);
+ $oTemplate->display('page_header.tpl');
}
/**
@@ -255,19 +252,19 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
*/
function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
- global $reply_focus, $javascript_on, $action;
+ global $reply_focus, $javascript_on, $action, $oTemplate;
if (empty($sBodyTagJs)) {
if (strpos($action, 'reply') !== FALSE && $reply_focus) {
- if ($reply_focus == 'select')
- $sBodyTagJs = 'onload="checkForm(\'select\');"';
- else if ($reply_focus == 'focus')
- $sBodyTagJs = 'onload="checkForm(\'focus\');"';
- else if ($reply_focus != 'none')
- $sBodyTagJs = 'onload="checkForm();"';
+ if ($reply_focus == 'select')
+ $sBodyTagJs = 'onload="checkForm(\'select\');"';
+ else if ($reply_focus == 'focus')
+ $sBodyTagJs = 'onload="checkForm(\'focus\');"';
+ else if ($reply_focus != 'none')
+ $sBodyTagJs = 'onload="checkForm();"';
}
else
- $sBodyTagJs = 'onload="checkForm();"';
+ $sBodyTagJs = 'onload="checkForm();"';
}
@@ -276,19 +273,25 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
*/
if($javascript_on) {
if ($sHeaderJs) {
- $sJsBlock = "\n\n";
} else {
- $sJsBlock = '';
+ $sJsBlock = '';
}
- $sJsBlock .= "\n" . '' ."\n";
+ $sJsBlock .= "\n";
+
+ $js_includes = $oTemplate->get_javascript_includes(TRUE);
+ foreach ($js_includes as $js_file) {
+ $sJsBlock .= '' ."\n";
+ }
+
displayHtmlHeader (_("Compose"), $sJsBlock);
} else {
/* javascript off */
displayHtmlHeader(_("Compose"));
$onload = '';
}
+// FIXME: should let the template echo all these kinds of things
echo "\n\n";
}
-?>