X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=91b5c9a6140463d94f373eb169b6f190adb9aca5;hp=5aca335a65c778dfddb88579cdf1a8d30e45a952;hb=a3d59ec355dba226b757372fed007c95bf19361e;hpb=8b096f0a2427cf0019f4dc4433a3e02b9f6f5951
diff --git a/functions/page_header.php b/functions/page_header.php
index 5aca335a..91b5c9a6 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-2005 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,37 +36,52 @@ 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" . html_tag( 'html' ,'' , '', '', 'lang="'.$squirrelmail_language.'"' ) .
+ "\n\n";
+ /*
+ * 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 "";
+ echo "";
}
} else {
echo '';
+ $base_uri . 'themes/css/'.$custom_css.'">';
}
-
+
if ($squirrelmail_language == 'ja_JP') {
+ /*
+ * force correct detection of charset, when browser does not follow
+ * http content-type and tries to detect charset from page content.
+ * Shooting of browser's creator can't be implemented in php.
+ * 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";
}
-
if ($do_hook) {
do_hook('generic_header');
}
-
- echo "\n$title$xtra\n";
+
+ echo "$title\n$xtra\n";
/* work around IE6's scrollbar bug */
echo <<
@@ -91,9 +107,18 @@ function makeInternalLink($path, $text, $target='') {
if ($target != '') {
$target = " target=\"$target\"";
}
- $hooktext = do_hook_function('internal_link',$text);
- if ($hooktext != '')
- $text = $hooktext;
+
+ // This is an inefficient hook and is only used by
+ // one plugin that still needs to patch this code,
+ // plus if we are templat-izing SM, visual hooks
+ // are not needed. However, I am leaving the code
+ // 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;
+
return ''.$text.'';
}
@@ -111,173 +136,41 @@ function displayInternalLink($path, $text, $target='') {
*
* @param array color the array of theme colors
* @param string mailbox the current mailbox name to display
- * @param string xtra extra html code to add
- * @param bool session
+ * @param string sHeaderJs javascipt code to be inserted in a script block in the header
+ * @param string sBodyTagJs js events to be inserted in the body tag
* @return void
*/
-function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
- global $hide_sm_attributions, $PHP_SELF, $frame_top,
- $compose_new_win, $compose_width, $compose_height,
- $attachemessages, $provider_name, $provider_uri,
- $javascript_on, $default_use_mdn, $mdn_user_support;
+function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="checkForm();"') {
+ global $hide_sm_attributions, $frame_top,
+ $provider_name, $provider_uri, $startMessage,
+ $javascript_on;
- sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION );
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
- $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
- if ($qmark = strpos($module, '?')) {
- $module = substr($module, 0, $qmark);
- }
+
if (!isset($frame_top)) {
$frame_top = '_top';
}
- if ($session) {
- $compose_uri = $base_uri.'src/compose.php?mailbox='.urlencode($mailbox).'&attachedmessages=true&session='."$session";
- } else {
- $compose_uri = $base_uri.'src/compose.php?newmessage=1';
- $session = 0;
- }
-
- if($javascript_on) {
-
- switch ( $module ) {
- case 'src/read_body.php':
- $js ='';
-
- // compose in new window code
- if ($compose_new_win == '1') {
- if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
- $compose_width = '640';
- }
- if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
- $compose_height = '550';
- }
- $js .= "function comp_in_new(comp_uri) {\n".
- " if (!comp_uri) {\n".
- ' comp_uri = "'.$compose_uri."\";\n".
- ' }'. "\n".
- ' var newwin = window.open(comp_uri' .
- ', "_blank",'.
- '"width='.$compose_width. ',height='.$compose_height.
- ',scrollbars=yes,resizable=yes");'."\n".
- "}\n\n";
- }
-
- // javascript for sending read receipts
- if($default_use_mdn && $mdn_user_support) {
- $js .= 'function sendMDN() {'."\n".
- " mdnuri=window.location+'&sendreceipt=1'; ".
- "var newwin = window.open(mdnuri,'right');".
- "\n}\n\n";
- }
-
- // if any of the above passes, add the JS tags too.
- if($js) {
- $js = "\n".'\n";
- }
-
- displayHtmlHeader ('SquirrelMail', $js);
- $onload = $xtra;
- break;
- case 'src/compose.php':
- $js = '\n";
- $onload = 'onload="checkForm();"';
- displayHtmlHeader ('SquirrelMail', $js);
- break;
-
- default:
- $js = '\n";
-
- $onload = 'onload="checkForm();"';
- displayHtmlHeader ('SquirrelMail', $js);
- break;
-
+ if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
+ $sJsBlock = '' ."\n";
+ if ($sHeaderJs) {
+ $sJsBlock .= "\n\n";
}
- } else {
+ displayHtmlHeader ('SquirrelMail', $sJsBlock);
+ } else {
/* do not use JavaScript */
displayHtmlHeader ('SquirrelMail');
- $onload = '';
+ $sBodyTagJs = '';
}
- echo "\n\n";
+ echo "\n\n";
+
/** Here is the header and wrapping table **/
- $shortBoxName = imap_utf7_decode_local(
- readShortMailboxName($mailbox, $delimiter));
+ $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
+ readShortMailboxName($mailbox, $delimiter)));
if ( $shortBoxName == 'INBOX' ) {
$shortBoxName = _("INBOX");
}
@@ -300,17 +193,17 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
: html_tag( 'td', '', 'left' ) )
. "\n";
$urlMailbox = urlencode($mailbox);
- echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox);
+ echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox.'&startMessage='.$startMessage);
echo " \n";
- displayInternalLink ('src/addressbook.php', _("Addresses"), 'right');
+ displayInternalLink ('src/addressbook.php', _("Addresses"));
echo " \n";
- displayInternalLink ('src/folders.php', _("Folders"), 'right');
+ displayInternalLink ('src/folders.php', _("Folders"));
echo " \n";
- displayInternalLink ('src/options.php', _("Options"), 'right');
+ displayInternalLink ('src/options.php', _("Options"));
echo " \n";
- displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), 'right');
+ displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"));
echo " \n";
- displayInternalLink ('src/help.php', _("Help"), 'right');
+ displayInternalLink ('src/help.php', _("Help"));
echo " \n";
do_hook('menuline');
@@ -320,13 +213,16 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
if (!$hide_sm_attributions)
{
echo html_tag( 'td', '', 'right' ) ."\n";
- if (!isset($provider_uri)) $provider_uri= 'http://www.squirrelmail.org/';
- if (!isset($provider_name)) $provider_name= 'SquirrelMail';
- echo ''.$provider_name.'';
+ if (empty($provider_uri)) {
+ echo 'SquirrelMail';
+ } else {
+ if (empty($provider_name)) $provider_name= 'SquirrelMail';
+ echo ''.$provider_name.'';
+ }
echo "\n";
}
echo " \n".
- "
\n\n";
+ "
\n\n";
}
/**
@@ -335,69 +231,30 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
*
* @param array color the array of theme colors
* @param string mailbox the current mailbox name to display
+ * @param string sHeaderJs javascipt code to be inserted in a script block in the header
+ * @param string sBodyTagJs js events to be inserted in the body tag
* @return void
*/
-function compose_Header($color, $mailbox) {
-
+function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="checkForm();"') {
global $javascript_on;
-
/*
* Locate the first displayable form element (only when JavaScript on)
*/
if($javascript_on) {
- global $delimiter, $base_uri, $PHP_SELF, $data_dir, $username;
-
- $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
-
- switch ( $module ) {
- case 'src/search.php':
- $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
- $onload = "onload=\"document.forms[$pos].elements[2].focus();\"";
- displayHtmlHeader (_("Compose"));
- break;
- default:
- $js = '\n";
- $onload = 'onload="checkForm();"';
- displayHtmlHeader (_("Compose"), $js);
- break;
+ if ($sHeaderJs) {
+ $sJsBlock = "\n\n";
+ } else {
+ $sJsBlock = '';
}
+ $sJsBlock .= "\n" . '' ."\n";
+ displayHtmlHeader (_("Compose"), $sJsBlock);
} else {
/* javascript off */
displayHtmlHeader(_("Compose"));
$onload = '';
}
-
- echo "\n\n";
+ echo "\n\n";
}
-
?>