X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=ceea10b213ed773b2ff3a652d0fcbc0bb90f1289;hp=07f53446a9f4071c618b73a27eaa7cf5943a4a50;hb=32485e5ee6413a19b736d0e08607884d193a7ff8;hpb=d68323ff96429e9d788a5144aaf8aa1afffc494c;ds=sidebyside
diff --git a/functions/page_header.php b/functions/page_header.php
index 07f53446..ceea10b2 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -3,7 +3,7 @@
/**
* page_header.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Prints the page header (duh)
@@ -18,20 +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 ( !check_php_version(4,1) ) {
- global $_SESSION;
- }
- if (isset($_SESSION['base_uri'])) {
- $base_uri = $_SESSION['base_uri'];
- }
- else {
+ 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' ,'' , '', '', '' ) . "\n\n";
if ( !isset( $custom_css ) || $custom_css == 'none' ) {
if ($theme_css != '') {
@@ -42,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');
}
@@ -64,33 +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='') {
- if ( !check_php_version(4,1) ) {
- global $_SESSION;
- }
-
- $base_uri = $_SESSION['base_uri'];
+function makeInternalLink($path, $text, $target='') {
+ sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
if ($target != '') {
$target = " target=\"$target\"";
}
- echo ''.$text.'';
+ 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;
- if ( !check_php_version(4,1) ) {
- global $_SESSION;
- }
-
- $base_uri = $_SESSION['base_uri'];
- $delimiter = $_SESSION['delimiter'];
+ 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);
@@ -105,120 +104,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";
@@ -245,12 +256,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
. html_tag( 'tr', '', '', $color[4] ) ."\n"
. 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";
@@ -279,54 +285,57 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
/* 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";
}
+
?>