Commit fixes courtesy of Ryan O'Neill

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index fd500049cadc4f2fef5f3c89f117299ae97bfa90..11268479f4b9e8bd22bf239a9ebf856867c58f7b 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 ) ) {
@@ -46,13 +47,36 @@ if (isset($newsort) && $newsort != $sort) {
     setPref($data_dir, $username, 'sort', $newsort);
 }
 
+/* decide if we are thread sorting or not */
+global $allow_thread_sort;
+if ($allow_thread_sort == TRUE) {
+    if (isset($set_thread)) {
+        if ($set_thread == 1) {
+            setPref($data_dir, $username, 'thread_sort_messages', 1);
+            $thread_sort_messages = '1';    
+        }
+        elseif ($set_thread == 2)  {
+            setPref($data_dir, $username, 'thread_sort_messages', 0);
+            $thread_sort_messages = '0';    
+        }
+    }
+    else {
+        $thread_sort_messages = getPref($data_dir, $username, 'thread_sort_messages');
+    }
+}
+else {
+    $thread_sort_messages = 0;
+} 
+
+
 /* If the page has been loaded without a specific mailbox, */
 /* send them to the inbox                                  */
 if (!isset($mailbox)) {
     $mailbox = 'INBOX';
     $startMessage = 1;
 }
-   
+
+
 if (!isset($startMessage) || ($startMessage == '')) {
     $startMessage = 1;
 }
@@ -62,13 +86,32 @@ 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');
-
 if (isset($note)) {
     echo "<CENTER><B>$note</B></CENTER><BR>\n";
 }
@@ -104,9 +147,11 @@ if (! isset($use_mailbox_cache)) {
 }
 
 /* There is a problem with registered vars in 4.1 */
-if( substr( phpversion(), 0, 3 ) == '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);
@@ -131,15 +176,17 @@ 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);