X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=fb68c39281d7740ca234857a4125f17583916049;hb=a61878d029c321a773834b25a146fe7a38f9b294;hp=3aa7c944bb2bc652affdcb2dcdb231572034dc83;hpb=88cb1b4d2ebd3e74fcee1d756df4e420da8bdf09;p=squirrelmail.git

diff --git a/src/right_main.php b/src/right_main.php
index 3aa7c944..fb68c392 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -19,6 +19,7 @@ require_once('../functions/array.php');
 require_once('../functions/mime.php');
 require_once('../functions/mailbox_display.php');
 require_once('../functions/display_messages.php');
+require_once('../functions/html.php');
 
 /***********************************************************
  * incoming variables from URL:                            *
@@ -33,12 +34,23 @@ require_once('../functions/display_messages.php');
  *    $key              pass                               *
  ***********************************************************/
 
-$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 ) ) {
+global $PG_SHOWNUM;
+if (isset($PG_SHOWALL)) {
+    if ($PG_SHOWALL) {
+       $PG_SHOWNUM=999999;
+       $show_num=$PG_SHOWNUM;
+       session_register('PG_SHOWNUM');
+    }
+    else {
+       session_unregister('PG_SHOWNUM');
+       unset($PG_SHOWNUM);
+    }
+}
+else if( isset( $PG_SHOWNUM ) ) {
     $show_num = $PG_SHOWNUM;
 }
 
@@ -46,13 +58,16 @@ if (isset($newsort) && $newsort != $sort) {
     setPref($data_dir, $username, 'sort', $newsort);
 }
 
+
+
 /* 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;
 }
@@ -63,32 +78,60 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
    $mailbox = 'INBOX';
 }
 
+/* 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_$mailbox", 1);
+            $thread_sort_messages = '1';    
+        }
+        elseif ($set_thread == 2)  {
+            setPref($data_dir, $username, "thread_$mailbox", 0);
+            $thread_sort_messages = '0';    
+        }
+    }
+    else {
+        $thread_sort_messages = getPref($data_dir, $username, "thread_$mailbox");
+    }
+}
+else {
+    $thread_sort_messages = 0;
+} 
+
+global $color;
+
+do_hook ("generic_header");
+
 sqimap_mailbox_select($imapConnection, $mailbox);
-if( strtolower( $mailbox ) == 'inbox' ) {
-    displayPageHeader($color, _("INBOX"));
+
+if (isset($composenew) && $composenew) {
+    $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
+		"&session=$composesession";
+    displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
 } else {
     displayPageHeader($color, $mailbox);
 }
-echo "<br>\n";
-
 do_hook('right_main_after_header');
-
 if (isset($note)) {
-    echo "<CENTER><B>$note</B></CENTER><BR>\n";
+    echo html_tag( 'div', '<b>' . $note .'</b>', 'center' ) . "<br>\n";
 }
 
 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]\">" .
-         '<tr><td>' .
-             "<table width=\"100%\" cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
-             "<tr><td align=center>$motd";
-        do_hook('motd');
-        echo '</td></tr>' .
-             '</table>' .
-             '</td></tr></table>';
+        echo html_tag( 'table',
+                    html_tag( 'tr',
+                        html_tag( 'td', 
+                            html_tag( 'table',
+                                html_tag( 'tr',
+                                    html_tag( 'td', $motd, 'center' )
+                                ) ,
+                            '', $color[4], 'width="100%" cellpadding="5" cellspacing="1" border="0"' )
+                         )
+                    ) ,
+                'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
     }
 }
 
@@ -137,18 +180,20 @@ 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 '</BODY></HTML>';
+echo '</body></html>';
 
-?>
\ No newline at end of file
+?>