final try

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

index d297506ee2f35822e9e1fd629e517acf28142e97..940cefecf74a5e3d1428ec47a479ff039af7dc0f 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -12,6 +12,7 @@
   */
  
  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 ) {
@@ -43,12 +44,16 @@ function displayInternalLink($path, $text, $target='') {
      echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
  }
  
-function displayPageHeader($color, $mailbox, $xtra='') {
+function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
  
      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,
+           $attachemessages, $session;
  
      $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';
      }
@@ -56,7 +61,37 @@ function displayPageHeader($color, $mailbox, $xtra='') {
      /*
          Locate the first displayable form element
      */
+
+    if ($session !== false) {
+       $compose_uri = 'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
+    } else {
+        $compose_uri = 'src/compose.php';
+    }
+
      switch ( $module ) {
+    case 'src/read_body.php':
+            if ($compose_new_win == '1') {
+                if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+                    $compose_width = '640';
+                }
+                if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+                    $compose_height = '550';
+                }
+                $js = "\n".'<script language="JavaScript" type="text/javascript">' .
+                    "\n<!--\n";
+                $js .= "function comp_in_new() {\n".
+                     "    var newwin = window.open(\"".$base_uri.$compose_uri. '"'.
+                     ", \"compose_window\",
+                \"width=".$compose_width.",height=$compose_height".
+                     ",scrollbars=yes,resizable=yes\");\n".
+                     "}\n";
+        $js .= "// -->\n".
+                "</script>\n";
+        displayHtmlHeader ('Squirrelmail', $js);
+            }
+        displayHtmlHeader();
+        $onload = $xtra;
+        break;
      default:
          $js = '<script language="JavaScript" type="text/javascript">' .
               "\n<!--\n" .
@@ -80,11 +115,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)) {
@@ -110,7 +140,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");
      }