X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=fb68c39281d7740ca234857a4125f17583916049;hb=a61878d029c321a773834b25a146fe7a38f9b294;hp=fd500049cadc4f2fef5f3c89f117299ae97bfa90;hpb=d46fbcf87c702f667a0a23832affb66de26092d7;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index fd500049..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,28 +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);
-displayPageHeader($color, $mailbox);
-echo "
\n";
+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);
+}
do_hook('right_main_after_header');
-
if (isset($note)) {
- echo "
$note
\n";
+ echo html_tag( 'div', '' . $note .'', 'center' ) . "
\n";
}
if ($just_logged_in == true) {
$just_logged_in = false;
if (strlen(trim($motd)) > 0) {
- echo "
" .
- '' .
- "" .
- "$motd";
- do_hook('motd');
- echo ' | ' .
- ' ' .
- ' |
';
+ 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"' );
}
}
@@ -104,9 +151,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,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 '