X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=46f45e43140dc44ea5bd90c6673bb143ebc9a3f0;hb=0493ed1186b2b5393e29facef012b1a028e8e52d;hp=6ece0a393a05f0658628c5368bdaea847ad0daa9;hpb=91c27aee3c2f6c883b2996827567999e291cfd19;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 6ece0a39..46f45e43 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -152,15 +152,13 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onloa
$frame_top = '_top';
}
- if( $javascript_on || strpos($xtra, 'new_js_autodetect_results.value') ) {
+ if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
+ $sJsBlock = '' ."\n";
if ($sHeaderJs) {
- $sJsBlock = "\n\n";
- } else {
- $sJsBlock = '';
+ $sHeaderJs . "\n\n// -->\n\n";
}
- $sJsBlock .= "\n" . '' ."\n";
displayHtmlHeader ('SquirrelMail', $sJsBlock);
} else {
/* do not use JavaScript */
@@ -195,6 +193,8 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onloa
: html_tag( 'td', '', 'left' ) )
. "\n";
$urlMailbox = urlencode($mailbox);
+ $startMessage = (int)$startMessage;
+
echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox.'&startMessage='.$startMessage);
echo " \n";
displayInternalLink ('src/addressbook.php', _("Addresses"));
@@ -246,7 +246,7 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="
if ($sHeaderJs) {
$sJsBlock = "\n\n";
+ $sHeaderJs . "\n\n// -->\n\n";
} else {
$sJsBlock = '';
}
@@ -259,4 +259,4 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="
}
echo "\n\n";
}
-?>
+?>
\ No newline at end of file