X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=50957d603e9444bbdec6e1614667b22b212f9719;hb=53ad5f6055e822d3873d3cd12e5305fd35c9ffdc;hp=00c26d4f2f728365ebd698d5f539b67a0830dc3b;hpb=40f3d54b823beb33f81d4028f58ab222c9720574;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 00c26d4f..50957d60 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -18,14 +18,15 @@ require_once(SM_PATH . 'functions/global.php');
/* Always set up the language before calling these functions */
function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
+ global $squirrelmail_language;
if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
global $base_uri;
}
- global $theme_css, $custom_css;
+ global $theme_css, $custom_css, $pageheader_sent;
echo '' .
- "\n\n\n\n";
+ "\n\n" . html_tag( 'html' ,'' , '', '', 'lang="'.$squirrelmail_language.'"' ) . "\n\n";
if ( !isset( $custom_css ) || $custom_css == 'none' ) {
if ($theme_css != '') {
@@ -36,6 +37,11 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
$base_uri . 'themes/css/'.$custom_css.'" />';
}
+ if ($squirrelmail_language == 'ja_JP') {
+ echo "\n";
+ echo '' . "\n";
+ }
+
if ($do_hook) {
do_hook('generic_header');
}
@@ -58,22 +64,32 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
ECHO;
echo "\n\n\n";
-}
+ /* this is used to check elsewhere whether we should call this function */
+ $pageheader_sent = TRUE;
+}
-function displayInternalLink($path, $text, $target='') {
+function makeInternalLink($path, $text, $target='') {
sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
if ($target != '') {
$target = " target=\"$target\"";
}
- echo ''.$text.'';
+ $hooktext = do_hook_function('internal_link',$text);
+ if ($hooktext != '')
+ $text = $hooktext;
+ return ''.$text.'';
+}
+
+function displayInternalLink($path, $text, $target='') {
+ echo makeInternalLink($path, $text, $target);
}
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;
+ $attachemessages, $provider_name, $provider_uri,
+ $javascript_on, $default_use_mdn, $mdn_user_support;
sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION );
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
@@ -91,120 +107,132 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
$compose_uri = $base_uri.'src/compose.php?newmessage=1';
$session = 0;
}
-
- switch ( $module ) {
- case 'src/read_body.php':
- $js ='';
- if ($compose_new_win == '1') {
- if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
- $compose_width = '640';
+
+ 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";
}
- if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
- $compose_height = '550';
+
+ // 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";
}
- $js .= "\n".'\n";
-
- }
- displayHtmlHeader ('SquirrelMail', $js);
- $onload = $xtra;
- break;
- case 'src/compose.php':
- $js = '\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;
+
+ default:
+ $js = '\n";
+ $js .= "// -->\n". "\n";
+ $onload = 'onload="checkForm();"';
+ displayHtmlHeader ('SquirrelMail', $js);
+ break;
- $onload = 'onload="checkForm();"';
- displayHtmlHeader ('SquirrelMail', $js);
- break;
-
+ }
+ } else {
+ /* do not use JavaScript */
+ displayHtmlHeader ('SquirrelMail');
+ $onload = '';
}
echo "\n\n";
@@ -229,14 +257,11 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
echo "\n"
. " \n"
. html_tag( 'tr', '', '', $color[4] ) ."\n"
- . html_tag( 'td', '', 'left' ) ."\n";
+ . ($hide_sm_attributions ? html_tag( 'td', '', 'left', '', 'colspan="2"' )
+ : html_tag( 'td', '', 'left' ) )
+ . "\n";
$urlMailbox = urlencode($mailbox);
- if ($compose_new_win == '1') {
- echo ''. _("Compose").'';
- }
- else {
- displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
- }
+ echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox);
echo " \n";
displayInternalLink ('src/addressbook.php', _("Addresses"), 'right');
echo " \n";
@@ -251,68 +276,74 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
do_hook('menuline');
- echo " \n"
- . html_tag( 'td', '', 'right' ) ."\n";
- if (!isset($provider_uri)) $provider_uri= 'http://www.squirrelmail.org/';
- if (!isset($provider_name)) $provider_name= 'SquirrelMail';
- echo ($hide_sm_attributions ? ' ' :
- ''.$provider_name.'');
- echo "\n".
- " \n".
+ echo " \n";
+
+ 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.'';
+ echo "\n";
+ }
+ echo " \n".
"
\n\n";
}
/* blatently copied/truncated/modified from the above function */
function compose_Header($color, $mailbox) {
- global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF,
- $data_dir, $username, $frame_top, $compose_new_win;
-
-
- $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
- if (!isset($frame_top)) {
- $frame_top = '_top';
- }
+ global $javascript_on;
/*
- Locate the first displayable form element
- */
- 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( pos >= 0 ) {\n".
+ "document.forms[i-1].elements[pos].focus();\n".
+ "}\n".
+ "}\n";
+ $js .= "// -->\n".
+ "\n";
+ $onload = 'onload="checkForm();"';
+ displayHtmlHeader (_("Compose"), $js);
+ break;
+ }
+ } else {
+ /* javascript off */
+ displayHtmlHeader(_("Compose"));
+ $onload = '';
}
echo "\n\n";
}
+
?>