"hocus" <hocus@dronet.pl>

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index f29392cad42b53c6f7b7dc6daad082a1d19a9802..37be5905e9ab3105c9a636cfa4364ee263373256 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -36,6 +36,7 @@ require_once('../functions/display_messages.php');
 $bob = getHashedFile($username, $data_dir, "username.pref");
 
 /* Open a connection on the imap port (143) */
+
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 if( isset( $PG_SHOWNUM ) ) {
@@ -62,9 +63,29 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
                                   substr($mailbox, 0, 1) == '/')) {
    $mailbox = 'INBOX';
 }
+    global $color;
+
+    if( isset($do_hook) && $do_hook ) {
+        do_hook ("generic_header");
+    }
 
 sqimap_mailbox_select($imapConnection, $mailbox);
-displayPageHeader($color, $mailbox);
+
+if (isset($composenew)) {
+    $width= getPref($username, $data_dir, 'editor_size', 76);
+    if ($width < 65) {
+        $pix_width = 560;
+    } else {
+        $width = (.9*$width);
+        $pix_width = intval($width).'0';
+    }
+    $features = "toolbar=no, width=$pix_width, height=650, scrollbars=yes, resizable=yes target=_blank";
+    $location = 'compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
+    $onload= "window.open(\"$location\",\"compose_window_$session\", \"$features\");";
+    displayPageHeader($color, $mailbox, $onload);
+} else {
+    displayPageHeader($color, $mailbox);
+}
 echo "<br>\n";
 
 do_hook('right_main_after_header');
@@ -77,9 +98,9 @@ if ($just_logged_in == true) {
     $just_logged_in = false;
 
     if (strlen(trim($motd)) > 0) {
-        echo "<br><table align=center width=70% cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
+        echo "<br><table align=center width=\"70%\" cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
          '<tr><td>' .
-             "<table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
+             "<table width=\"100%\" cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
              "<tr><td align=center>$motd";
         do_hook('motd');
         echo '</td></tr>' .
@@ -103,6 +124,13 @@ if (! isset($use_mailbox_cache)) {
     $use_mailbox_cache = 0;
 }
 
+/* There is a problem with registered vars in 4.1 */
+/*
+if( substr( phpversion(), 0, 3 ) == '4.1'  ) {
+    $use_mailbox_cache = FALSE;
+}
+*/
+
 if ($use_mailbox_cache && session_is_registered('msgs')) {
     showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
 } else {
@@ -126,18 +154,21 @@ if ($use_mailbox_cache && session_is_registered('msgs')) {
 
     if (session_is_registered('msgs') && isset($msgs)) {
         session_register('msgs');
+        $_SESSION['msgs'] = $msgs;
     }
 
     if (session_is_registered('msort') && isset($msort)) {
         session_register('msort');
+        $_SESSION['msort'] = $msort;
     }
 
     session_register('numMessages');
+    $_SESSION['numMessages'] = $numMessages;
 }
 
 do_hook('right_main_bottom');
 sqimap_logout ($imapConnection);
 
-echo '</FONT></BODY></HTML>';
+echo '</BODY></HTML>';
 
 ?>