X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=5ed8469ea4f4cad6d6e1e5afab99c0e0fba38547;hb=50d5212cd729d067bd9d4243fd66eed39d608207;hp=5aca335a65c778dfddb88579cdf1a8d30e45a952;hpb=8b096f0a2427cf0019f4dc4433a3e02b9f6f5951;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 5aca335a..5ed8469e 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -3,12 +3,12 @@
/**
* page_header.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Prints the page header (duh)
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
*/
@@ -25,9 +25,10 @@ require_once(SM_PATH . 'functions/global.php');
* @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 ) {
+function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true, $frames = false ) {
global $squirrelmail_language;
if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
@@ -35,8 +36,12 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
}
global $theme_css, $custom_css, $pageheader_sent;
- echo '' .
- "\n\n" . html_tag( 'html' ,'' , '', '', 'lang="'.$squirrelmail_language.'"' ) . "\n\n";
+ if ($frames) {
+ echo '';
+ } else {
+ echo '';
+ }
+ echo "\n\n" . html_tag( 'html' ,'' , '', '', 'lang="'.$squirrelmail_language.'"' ) . "\n\n";
if ( !isset( $custom_css ) || $custom_css == 'none' ) {
if ($theme_css != '') {
@@ -46,16 +51,16 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
echo '';
}
-
+
if ($squirrelmail_language == 'ja_JP') {
echo "\n";
- echo '' . "\n";
+ echo '' . "\n";
}
-
+
if ($do_hook) {
do_hook('generic_header');
}
-
+
echo "\n$title$xtra\n";
/* work around IE6's scrollbar bug */
@@ -63,9 +68,9 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE