rollback

[squirrelmail.git] / functions / page_header.php
diff --git a/functions/page_header.php b/functions/page_header.php

index dc33315c94d9008eb65cf5cd2a33fa69b8d7b2fb..7e63f0af9c2b9af27b9955da29aec17e331c488e 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -12,6 +12,8 @@
   */
  
  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 ) {
@@ -46,12 +48,9 @@ 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;
+    $compose_new_win, $username, $datadir, $compose_width, $compose_height, $session, $attachemessages;
  
      $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
-    if ($qmark = strpos($module, '?')) {
-        $module = substr($module, 0, $qmark);
-    }
      if (!isset($frame_top)) {
          $frame_top = '_top';
      }
@@ -83,6 +82,12 @@ 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';
@@ -91,9 +96,9 @@ function displayPageHeader($color, $mailbox, $xtra='') {
                      $compose_height = '550';
                  }
                  $js .= "function comp_in_new() {\n".
-                     "    var newwin = window.open(\"".$base_uri."src/compose.php\"".
-                     ", \"compose_window\",
-                \"width=".$compose_width.",height=$compose_height".
+                     '    var newwin = window.open("'.$base_uri.$compose_uri . '"' .
+                     ', "compose_window",
+                "width='.$compose_width.",height=$compose_height".
                       ",scrollbars=yes,resizable=yes\");\n".
                       "}\n";
              }
@@ -107,7 +112,8 @@ function displayPageHeader($color, $mailbox, $xtra='') {
  
      echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" $onload>\n\n";
      /** Here is the header and wrapping table **/
-    $shortBoxName = readShortMailboxName($mailbox, $delimiter);
+    $shortBoxName = imap_utf7_decode_local(readShortMailboxName($mailbox, $delimiter));
+    
      if ( $shortBoxName == 'INBOX' ) {
          $shortBoxName = _("INBOX");
      }
@@ -177,9 +183,6 @@ function compose_Header($color, $mailbox) {
          $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
          displayHtmlHeader (_("Compose"));
          break;
-    case 'src/read_body.php':
-        displayHtmlHeader();
-        break;
      default:
          $js = '<script language="JavaScript" type="text/javascript">' .
               "\n<!--\n" .