X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=8470069f43f3eed1b6d14d03f1ab29b23de304a8;hp=d63a634dc19aef962ba530e87236ff18b4bc3064;hb=cd9a4fd36723c95a9e847922dd99c8ea22bd947c;hpb=23d6bd09c631285eae8c45af3a37aa7c86be3cfa
diff --git a/src/right_main.php b/src/right_main.php
index d63a634d..8470069f 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,130 +1,240 @@
\n";
- do_hook('right_main_after_header');
+if (!isset($startMessage) || ($startMessage == '')) {
+ $startMessage = 1;
+}
- if (isset($note)) {
- echo "
$note
\n";
+/* compensate for the UW vulnerability. */
+if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
+ substr($mailbox, 0, 1) == '/')) {
+ $mailbox = 'INBOX';
+}
+
+/* decide if we are thread sorting or not */
+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;
+}
+
+do_hook ('generic_header');
+
+sqimap_mailbox_select($imapConnection, $mailbox);
+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 html_tag( 'div', '' . $note .'', 'center' ) . "
\n";
+}
+
+if (isset($_SESSION['just_logged_in'])) {
+ $just_logged_in = $_SESSION['just_logged_in'];
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"' );
}
}
-
- if (isset($newsort)) {
- $sort = $newsort;
- session_register('sort');
+}
+
+if (isset($newsort)) {
+ $sort = $newsort;
+ sqsession_register($sort, 'sort');
+}
+
+/*********************************************************************
+ * Check to see if we can use cache or not. Currently the only time *
+ * when you will not use it is when a link on the left hand frame is *
+ * used. Also check to make sure we actually have the array in the *
+ * registered session data. :) *
+ *********************************************************************/
+if (! isset($use_mailbox_cache)) {
+ $use_mailbox_cache = 0;
+}
+
+if ($use_mailbox_cache && session_is_registered('msgs')) {
+ showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
+} else {
+ if (session_is_registered('msgs')) {
+ unset($msgs);
}
- /*********************************************************************
- * Check to see if we can use cache or not. Currently the only time *
- * when you will not use it is when a link on the left hand frame is *
- * used. Also check to make sure we actually have the array in the *
- * registered session data. :) *
- *********************************************************************/
- if (! isset($use_mailbox_cache)) {
- $use_mailbox_cache = 0;
+ if (session_is_registered('msort')) {
+ unset($msort);
}
- if ($use_mailbox_cache && session_is_registered('msgs')) {
- showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
- } else {
- if (session_is_registered('msgs')) {
- unset($msgs);
- }
-
- if (session_is_registered('msort')) {
- unset($msort);
- }
+ if (session_is_registered('numMessages')) {
+ unset($numMessages);
+ }
- if (session_is_registered('numMessages')) {
- unset($numMessages);
- }
+ $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
- $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
+ showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
+ $startMessage, $sort, $color, $show_num,
+ $use_mailbox_cache);
- showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
+ if (session_is_registered('msgs') && isset($msgs)) {
+ sqsession_register($msgs, 'msgs');
+ $_SESSION['msgs'] = $msgs;
+ }
- if (session_is_registered('msgs') && isset($msgs)) {
- session_register('msgs');
- }
+ if (session_is_registered('msort') && isset($msort)) {
+ sqsession_register($msort, 'msort');
+ $_SESSION['msort'] = $msort;
+ }
- if (session_is_registered('msort') && isset($msort)) {
- session_register('msort');
- }
+ sqsession_register($numMessages, 'numMessages');
+ $_SESSION['numMessages'] = $numMessages;
+}
+do_hook('right_main_bottom');
+sqimap_logout ($imapConnection);
- session_register('numMessages');
- }
+echo '