final try

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2843 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/page_header.php b/functions/page_header.php
index 392a3f44bf5fbe39ad222a3840283c29457fc251..940cefecf74a5e3d1428ec47a479ff039af7dc0f 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -44,10 +44,11 @@ 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;
+           $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, '?')) {
@@ -60,6 +61,13 @@ 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') {
@@ -72,7 +80,7 @@ function displayPageHeader($color, $mailbox, $xtra='') {
                 $js = "\n".'<script language="JavaScript" type="text/javascript">' .
                     "\n<!--\n";
                 $js .= "function comp_in_new() {\n".
-                     "    var newwin = window.open(\"".$base_uri."src/compose.php\"".
+                     "    var newwin = window.open(\"".$base_uri.$compose_uri. '"'.
                      ", \"compose_window\",
                 \"width=".$compose_width.",height=$compose_height".
                      ",scrollbars=yes,resizable=yes\");\n".
@@ -82,7 +90,7 @@ function displayPageHeader($color, $mailbox, $xtra='') {
         displayHtmlHeader ('Squirrelmail', $js);
             }
         displayHtmlHeader();
-        $onload = '';
+        $onload = $xtra;
         break;
     default:
         $js = '<script language="JavaScript" type="text/javascript">' .
@@ -107,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)) {

diff --git a/src/right_main.php b/src/right_main.php
index 72234ec1dd0509bbd72dc3388df9063f284eaafa..59d84f328497fece7b5082fc7f7117e99ef8fb9c 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -108,7 +108,7 @@ if( isset($do_hook) && $do_hook ) {
 sqimap_mailbox_select($imapConnection, $mailbox);
 
 if (isset($composenew) && $composenew) {
-    displayPageHeader($color, $mailbox, 'comp_in_new();');
+    displayPageHeader($color, $mailbox, 'comp_in_new();', $session);
 } else {
     displayPageHeader($color, $mailbox);
 }

diff --git a/src/search.php b/src/search.php
index 971248fe6506853b9d2e1147423b4ae82a47010b..cd7db4e28aeab6e15e691afd8347a8b0bc75d63b 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -182,7 +182,7 @@ if ($mailbox == 'All Folders') {
 }
 
 if (isset($composenew) && $composenew) {
-    displayPageHeader($color, $mailbox, 'comp_in_new();');
+    displayPageHeader($color, $mailbox, 'comp_in_new();', $session);
 } else {
     displayPageHeader($color, $mailbox);
 }