From 28e1ac8ad0d5a729172d7f1f0cded8f9e5204aec Mon Sep 17 00:00:00 2001 From: stekkel Date: Fri, 17 May 2002 12:31:25 +0000 Subject: [PATCH] rollback2 git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2840 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/page_header.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/functions/page_header.php b/functions/page_header.php index 7e63f0af..b2802169 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -12,8 +12,6 @@ */ require_once('../functions/strings.php'); -require_once('../functions/imap_utf7_decode_local.php'); - /* Always set up the language before calling these functions */ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) { @@ -48,7 +46,7 @@ function displayInternalLink($path, $text, $target='') { function displayPageHeader($color, $mailbox, $xtra='') { global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, - $compose_new_win, $username, $datadir, $compose_width, $compose_height, $session, $attachemessages; + $compose_new_win, $username, $datadir, $compose_width, $compose_height; $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 ); if (!isset($frame_top)) { @@ -82,12 +80,6 @@ function displayPageHeader($color, $mailbox, $xtra='') { "}\n". "$xtra\n". "}\n"; - if (isset($attachemessages) && isset($session)) { - $compose_uri = 'compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session"; - } else { - $compose_uri = 'src/compose.php'; - } - if ($compose_new_win == '1') { if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) { $compose_width = '640'; @@ -96,9 +88,9 @@ function displayPageHeader($color, $mailbox, $xtra='') { $compose_height = '550'; } $js .= "function comp_in_new() {\n". - ' var newwin = window.open("'.$base_uri.$compose_uri . '"' . - ', "compose_window", - "width='.$compose_width.",height=$compose_height". + " var newwin = window.open(\"".$base_uri."src/compose.php\"". + ", \"compose_window\", + \"width=".$compose_width.",height=$compose_height". ",scrollbars=yes,resizable=yes\");\n". "}\n"; } @@ -112,8 +104,7 @@ function displayPageHeader($color, $mailbox, $xtra='') { echo "\n\n"; /** Here is the header and wrapping table **/ - $shortBoxName = imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter)); - + $shortBoxName = readShortMailboxName($mailbox, $delimiter); if ( $shortBoxName == 'INBOX' ) { $shortBoxName = _("INBOX"); } -- 2.25.1