X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=c335530594c48b60b8ecb0ca2b5d0327f96f2431;hb=15bc7f666ca2f73a6317b086e9f626885dc52263;hp=662807a69a6ed8e19748778261155ef0ad9b5c40;hpb=12ff1cab14f01a1918c7d3d40e6358c13c3833a7;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 662807a6..c3355305 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,62 +18,78 @@ 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;
+ 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 != '') {
- 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 <<
+
+
-function displayInternalLink($path, $text, $target='') {
- if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
- global $_SESSION;
- }
+ECHO;
+
+ echo "\n\n\n";
- $base_uri = $_SESSION['base_uri'];
+ /* this is used to check elsewhere whether we should call this function */
+ $pageheader_sent = TRUE;
+}
+
+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, $username, $datadir, $compose_width, $compose_height,
- $attachemessages, $provider_name, $provider_uri;
+ $compose_new_win, $compose_width, $compose_height,
+ $attachemessages, $provider_name, $provider_uri,
+ $javascript_on;
- 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);
@@ -83,125 +99,132 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
}
if ($session) {
- $compose_uri = $base_uri.'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$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;
}
-
- 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 (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
- $compose_height = '550';
- }
- $js .= "\n".'\n";
+
+ if($javascript_on) {
+
+ 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 (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+ $compose_height = '550';
+ }
+ $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;
+
+ 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";
@@ -228,25 +251,20 @@ 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');
+ 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,53 +280,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, $frame_top, $compose_new_win;
+ 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 );
- if (!isset($frame_top)) {
- $frame_top = '_top';
- }
+ $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
- /*
- 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";
}
+
?>