rollback

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

index 67bd6314164a6f13bfa7cf08237ee92f0f684978..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 ) {
@@ -27,7 +29,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
          }
      } else {
          echo '<LINK REL="stylesheet" TYPE="text/css" HREF="' .
-             $base_uri . 'themes/css/$custom_css">';
+             $base_uri . 'themes/css/'.$custom_css.'">';
      }
      
      echo "\n<title>$title</title>$xtra</head>\n\n";
@@ -45,7 +47,8 @@ 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;
+    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top,
+    $compose_new_win, $username, $datadir, $compose_width, $compose_height, $session, $attachemessages;
  
      $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
      if (!isset($frame_top)) {
@@ -56,11 +59,6 @@ function displayPageHeader($color, $mailbox, $xtra='') {
          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 ();
-        break;
      default:
          $js = '<script language="JavaScript" type="text/javascript">' .
               "\n<!--\n" .
@@ -84,18 +82,23 @@ 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') {
-                $width= getPref($username, $datadir, 'editor_size', 76);
-                if ($width < 65) {
-                    $pix_width = 560;
+                if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+                    $compose_width = '640';
                  }
-                else {
-                    $width = (.9*$width);
-                    $pix_width = intval($width).'0';
+                if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+                    $compose_height = '550';
                  }
                  $js .= "function comp_in_new() {\n".
-                     "    var newwin = window.open(\"".$base_uri."src/compose.php\"".
-                     ", \"compose_window\", \"width=".$pix_width.",height=650".
+                     '    var newwin = window.open("'.$base_uri.$compose_uri . '"' .
+                     ', "compose_window",
+                "width='.$compose_width.",height=$compose_height".
                       ",scrollbars=yes,resizable=yes\");\n".
                       "}\n";
              }
@@ -107,10 +110,10 @@ 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");
      }