X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=f4173981cce97f9cc66c64231720467dc3bb7cc9;hb=5e9a440becde2c0c0983821622779e309276ee30;hp=6d6276e687c7561b4d9d2ba7391774640003bd77;hpb=610ded64a74806d481d95637da36ab3b5bb22fdb;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index 6d6276e6..f4173981 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,24 +1,30 @@
\n";
+if ($composenew) {
+ $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+ "&session=$session";
+ displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
+} else {
+ displayPageHeader($color, $mailbox);
+}
do_hook('right_main_after_header');
+/* display a message to the user that their mail has been sent */
+if (isset($mail_sent) && $mail_sent == 'yes') {
+ $note = _("Your Message has been sent.");
+}
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 ' | ' .
- ' ' .
- ' |
';
+if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
+ if ($just_logged_in == true) {
+ $just_logged_in = false;
+ sqsession_register($just_logged_in, 'just_logged_in');
+
+ if (strlen(trim($motd)) > 0) {
+ 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');
-}
/*********************************************************************
* Check to see if we can use cache or not. Currently the only time *
@@ -103,48 +199,43 @@ 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')) {
+if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
} else {
- if (session_is_registered('msgs')) {
+ if (sqsession_is_registered('msgs')) {
unset($msgs);
}
- if (session_is_registered('msort')) {
+ if (sqsession_is_registered('msort')) {
unset($msort);
}
- if (session_is_registered('numMessages')) {
+ if (sqsession_is_registered('numMessages')) {
unset($numMessages);
}
$numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
- showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
+ showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
$startMessage, $sort, $color, $show_num,
$use_mailbox_cache);
- if (session_is_registered('msgs') && isset($msgs)) {
- session_register('msgs');
+ if (sqsession_is_registered('msgs') && isset($msgs)) {
+ sqsession_register($msgs, 'msgs');
+ //$_SESSION['msgs'] = $msgs;
}
- if (session_is_registered('msort') && isset($msort)) {
- session_register('msort');
+ if (sqsession_is_registered('msort') && isset($msort)) {
+ sqsession_register($msort, 'msort');
+ //$_SESSION['msort'] = $msort;
}
- session_register('numMessages');
+ sqsession_register($numMessages, 'numMessages');
+ //$_SESSION['numMessages'] = $numMessages;
}
-
do_hook('right_main_bottom');
sqimap_logout ($imapConnection);
-echo '