X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=1d3ef5e53f0001beda0be67ca1edb1e5aa5d88af;hb=9bd3b1e61b35fd25ed9d724571004a80b9f8ab2c;hp=d858149488494e9319db85986d6a8f28ce3a736f;hpb=d7f8e6e69e33b218bf6d7775a53c811d839bce61;p=squirrelmail.git diff --git a/src/right_main.php b/src/right_main.php index d8581494..1d3ef5e5 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -3,22 +3,28 @@ /** * right_main.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This is where the mailboxes are listed. This controls most of what * goes on in SquirrelMail. * * $Id$ + * @package squirrelmail */ -require_once('../src/validate.php'); -require_once('../functions/imap.php'); -require_once('../functions/date.php'); -require_once('../functions/array.php'); -require_once('../functions/mime.php'); -require_once('../functions/mailbox_display.php'); -require_once('../functions/display_messages.php'); +/** Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'include/validate.php'); +require_once(SM_PATH . 'functions/global.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/date.php'); +require_once(SM_PATH . 'functions/mime.php'); +require_once(SM_PATH . 'functions/mailbox_display.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/html.php'); /*********************************************************** * incoming variables from URL: * @@ -29,25 +35,64 @@ require_once('../functions/display_messages.php'); * $mailbox Full Mailbox name * * * * incoming from cookie: * - * $username duh * * $key pass * + * incoming from session: * + * $username duh * + * * ***********************************************************/ -$bob = getHashedFile($username, $data_dir, "username.pref"); + +/* lets get the global vars we may need */ +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); + +sqgetGlobalVar('mailbox', $mailbox); +sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION); +sqgetGlobalVar('numMessages' , $numMessages, SQ_SESSION); +sqgetGlobalVar('session', $session, SQ_GET); +sqgetGlobalVar('note', $note, SQ_GET); +sqgetGlobalVar('mail_sent', $mail_sent, SQ_GET); +sqgetGlobalVar('use_mailbox_cache', $use_mailbox_cache, SQ_GET); + +if ( sqgetGlobalVar('startMessage', $temp) ) { + $startMessage = (int) $temp; +} +if ( sqgetGlobalVar('PG_SHOWNUM', $temp) ) { + $PG_SHOWNUM = (int) $temp; +} +if ( sqgetGlobalVar('PG_SHOWALL', $temp, SQ_GET) ) { + $PG_SHOWALL = (int) $temp; +} +if ( sqgetGlobalVar('newsort', $temp, SQ_GET) ) { + $newsort = (int) $temp; +} +if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) { + $checkall = (int) $temp; +} +if ( sqgetGlobalVar('set_thread', $temp, SQ_GET) ) { + $set_thread = (int) $temp; +} +if ( !sqgetGlobalVar('composenew', $composenew, SQ_GET) ) { + $composenew = false; +} +/* end of get globals */ + /* Open a connection on the imap port (143) */ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -global $PG_SHOWNUM; if (isset($PG_SHOWALL)) { if ($PG_SHOWALL) { $PG_SHOWNUM=999999; $show_num=$PG_SHOWNUM; - session_register('PG_SHOWNUM'); + sqsession_register($PG_SHOWNUM, 'PG_SHOWNUM'); } else { - session_unregister('PG_SHOWNUM'); + sqsession_unregister('PG_SHOWNUM'); unset($PG_SHOWNUM); } } @@ -80,7 +125,6 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') || } /* 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) { @@ -100,46 +144,51 @@ else { $thread_sort_messages = 0; } -global $color; -if( isset($do_hook) && $do_hook ) { - do_hook ("generic_header"); -} +do_hook ('generic_header'); sqimap_mailbox_select($imapConnection, $mailbox); -if (isset($composenew) && $composenew) { - $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox). - "&session=$composesession&attachedmessages=true&"; - - displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false); +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); } -echo "
\n"; - 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'); + sqsession_register($sort, 'sort'); } /********************************************************************* @@ -152,25 +201,18 @@ 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); } @@ -180,22 +222,22 @@ if ($use_mailbox_cache && session_is_registered('msgs')) { $startMessage, $sort, $color, $show_num, $use_mailbox_cache); - if (session_is_registered('msgs') && isset($msgs)) { - session_register('msgs'); - $_SESSION['msgs'] = $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'); - $_SESSION['msort'] = $msort; + if (sqsession_is_registered('msort') && isset($msort)) { + sqsession_register($msort, 'msort'); + //$_SESSION['msort'] = $msort; } - session_register('numMessages'); - $_SESSION['numMessages'] = $numMessages; + sqsession_register($numMessages, 'numMessages'); + //$_SESSION['numMessages'] = $numMessages; } do_hook('right_main_bottom'); sqimap_logout ($imapConnection); -echo ''; +echo ''; ?>