X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=bf731b50f10be978eb8d89c9110bc1c0a7e9c197;hb=60090c1c671f69340d60d5d006bc0423a0009732;hp=6d9249295cdd230916b0c3ee195a926e4ae6d4a6;hpb=1f2eaa02c9834682003da4372b83a2e79c505a2d;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 6d924929..bf731b50 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,44 +18,57 @@ 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 ( (float)substr(PHP_VERSION,0,3) < 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;
- echo '' .
- "\n\n\n\n";
+ echo '' .
+ "\n\n" . html_tag( 'html' ,'' , '', '', '' ) . "\n\n";
if ( !isset( $custom_css ) || $custom_css == 'none' ) {
if ($theme_css != '') {
- echo "";
+ echo "";
}
} else {
- echo '';
+ echo '';
+ }
+
+ if ($squirrelmail_language == 'ja_JP') {
+ echo "\n";
+ echo '' . "\n";
}
if ($do_hook) {
- do_hook("generic_header");
+ do_hook('generic_header');
}
- echo "\n$title$xtra\n\n";
+ echo "\n$title$xtra\n";
+
+ /* work around IE6's scrollbar bug */
+ echo <<
+
+
+
+ECHO;
+
+ echo "\n\n\n";
}
function displayInternalLink($path, $text, $target='') {
- if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
- global $_SESSION;
- }
-
- $base_uri = $_SESSION['base_uri'];
+ sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
if ($target != '') {
$target = " target=\"$target\"";
}
@@ -65,15 +78,11 @@ function displayInternalLink($path, $text, $target='') {
function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
global $hide_sm_attributions, $PHP_SELF, $frame_top,
- $compose_new_win, $username, $datadir, $compose_width, $compose_height,
- $attachemessages, $session, $provider_name, $provider_uri;
+ $compose_new_win, $compose_width, $compose_height,
+ $attachemessages, $provider_name, $provider_uri;
- if ( (float)substr(PHP_VERSION,0,3) < 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);
@@ -82,8 +91,8 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
$frame_top = '_top';
}
- if ($session != false) {
- $compose_uri = $base_uri.'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
+ 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;
@@ -121,7 +130,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
"\n";
}
- displayHtmlHeader ('Squirrelmail', $js);
+ displayHtmlHeader ('SquirrelMail', $js);
$onload = $xtra;
break;
case 'src/compose.php':
@@ -149,8 +158,8 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
$js .= "// -->\n".
"\n";
- $onload = "onLoad=\"checkForm();\"";
- displayHtmlHeader ('Squirrelmail', $js);
+ $onload = 'onload="checkForm();"';
+ displayHtmlHeader ('SquirrelMail', $js);
break;
default:
@@ -164,7 +173,8 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
"var e = document.forms[i].elements.length;\n".
"var j = 0;\n".
"while( pos == -1 && j < e ) {\n".
- "if ( document.forms[i].elements[j].type == 'text' ) {\n".
+ "if ( document.forms[i].elements[j].type == 'text' " .
+ "|| document.forms[i].elements[j].type == 'password' ) {\n".
"pos = j;\n".
"}\n".
"j++;\n".
@@ -198,8 +208,8 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
$js .= "// -->\n". "\n";
- $onload = "onLoad=\"checkForm();\"";
- displayHtmlHeader ('Squirrelmail', $js);
+ $onload = 'onload="checkForm();"';
+ displayHtmlHeader ('SquirrelMail', $js);
break;
}
@@ -229,24 +239,24 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
. html_tag( 'td', '', 'left' ) ."\n";
$urlMailbox = urlencode($mailbox);
if ($compose_new_win == '1') {
- echo "". _("Compose"). '';
+ echo ''. _("Compose").'';
}
else {
displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
}
echo " \n";
- displayInternalLink ("src/addressbook.php", _("Addresses"), 'right');
+ displayInternalLink ('src/addressbook.php', _("Addresses"), 'right');
echo " \n";
- displayInternalLink ("src/folders.php", _("Folders"), 'right');
+ displayInternalLink ('src/folders.php', _("Folders"), 'right');
echo " \n";
- displayInternalLink ("src/options.php", _("Options"), 'right');
+ displayInternalLink ('src/options.php', _("Options"), 'right');
echo " \n";
displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), 'right');
echo " \n";
- displayInternalLink ("src/help.php", _("Help"), 'right');
+ displayInternalLink ('src/help.php', _("Help"), 'right');
echo " \n";
- do_hook("menuline");
+ do_hook('menuline');
echo " \n"
. html_tag( 'td', '', 'right' ) ."\n";
@@ -262,7 +272,8 @@ 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, $frame_top, $compose_new_win;
+ 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 );
@@ -276,7 +287,7 @@ function compose_Header($color, $mailbox) {
switch ( $module ) {
case 'src/search.php':
$pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
- $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
+ $onload = "onload=\"document.forms[$pos].elements[2].focus();\"";
displayHtmlHeader (_("Compose"));
break;
default:
@@ -303,7 +314,7 @@ function compose_Header($color, $mailbox) {
"}\n";
$js .= "// -->\n".
"\n";
- $onload = "onLoad=\"checkForm();\"";
+ $onload = 'onload="checkForm();"';
displayHtmlHeader (_("Compose"), $js);
break;
@@ -311,4 +322,5 @@ function compose_Header($color, $mailbox) {
echo "\n\n";
}
-?>
+
+?>
\ No newline at end of file