X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=7ea711d077d104ddff771755a0e8eeb39ea8e5f2;hb=b44ee3f0f2ffca2217c29803f3c411e562ad937a;hp=9d868311b7212436f4ae4a3965dc4b816a700c18;hpb=cdaf83380491dd3436b59804d36ae1cd6f1c66f5;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 9d868311..7ea711d0 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -12,9 +12,9 @@
*/
require_once('../functions/strings.php');
-require_once('../functions/imap_utf7_decode_local.php');
+//require_once('../functions/imap_utf7_decode_local.php');
require_once('../functions/html.php');
-
+require_once('../functions/imap_mailbox.php');
/* Always set up the language before calling these functions */
function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
@@ -31,21 +31,21 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
echo '';
}
-
+
if ($do_hook) {
- do_hook ("generic_header");
+ do_hook("generic_header");
}
echo "\n
$title$xtra\n\n";
}
+
function displayInternalLink($path, $text, $target='') {
global $base_uri;
if ($target != '') {
$target = " target=\"$target\"";
}
-
echo ''.$text.'';
}
@@ -63,19 +63,16 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
$frame_top = '_top';
}
- /*
- Locate the first displayable form element
- */
-
if ($session != false) {
- $compose_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 = 'src/compose.php?newmessage=1';
+ $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';
@@ -83,28 +80,30 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
$compose_height = '550';
}
- $js = "\n".'\n";
- displayHtmlHeader ('Squirrelmail', $js);
- }
- displayHtmlHeader();
- $onload = $xtra;
+
+ $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";
+ $js .= "// -->\n". "\n";
+
+
$onload = "onLoad=\"checkForm();\"";
displayHtmlHeader ('Squirrelmail', $js);
break;
@@ -213,7 +210,7 @@ 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');