X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fright_main.php;h=d858149488494e9319db85986d6a8f28ce3a736f;hb=d7f8e6e69e33b218bf6d7775a53c811d839bce61;hp=d63a634dc19aef962ba530e87236ff18b4bc3064;hpb=23d6bd09c631285eae8c45af3a37aa7c86be3cfa;p=squirrelmail.git diff --git a/src/right_main.php b/src/right_main.php index d63a634d..d8581494 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -1,130 +1,201 @@ \n"; +global $color; +if( isset($do_hook) && $do_hook ) { + do_hook ("generic_header"); +} - do_hook('right_main_after_header'); +sqimap_mailbox_select($imapConnection, $mailbox); - if (isset($note)) { - echo "
$note

\n"; - } +if (isset($composenew) && $composenew) { + $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox). + "&session=$composesession&attachedmessages=true&"; - if ($just_logged_in == true) { - $just_logged_in = false; - - if (strlen(trim($motd)) > 0) { - echo "
" . - '
' . - "" . - "' . - '
$motd"; - do_hook('motd'); - echo '
' . - '
'; - } + displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false); +} else { + displayPageHeader($color, $mailbox); +} +echo "
\n"; + +do_hook('right_main_after_header'); +if (isset($note)) { + echo "
$note

\n"; +} + +if ($just_logged_in == true) { + $just_logged_in = false; + + if (strlen(trim($motd)) > 0) { + echo "
" . + '
' . + "" . + "' . + '
$motd"; + do_hook('motd'); + echo '
' . + '
'; } - - if (isset($newsort)) { - $sort = $newsort; - session_register('sort'); +} + +if (isset($newsort)) { + $sort = $newsort; + session_register('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; +} + +/* 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')) { + 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)) { + session_register('msgs'); + $_SESSION['msgs'] = $msgs; + } - if (session_is_registered('msgs') && isset($msgs)) { - session_register('msgs'); - } + if (session_is_registered('msort') && isset($msort)) { + session_register('msort'); + $_SESSION['msort'] = $msort; + } - if (session_is_registered('msort') && isset($msort)) { - session_register('msort'); - } + session_register('numMessages'); + $_SESSION['numMessages'] = $numMessages; +} +do_hook('right_main_bottom'); +sqimap_logout ($imapConnection); - session_register('numMessages'); - } +echo ''; - do_hook('right_main_bottom'); - sqimap_logout ($imapConnection); ?> - - -