X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=cdd66223fd5247f0a91258a673b4bea1ecfdb6b4;hb=2878b00ba5a908f5ca4b3d6e7d00c5bfb6618cc8;hp=78764eb5d8a1a5b8fbe1b7d4aef20d9da81c6cf8;hpb=32c967ec609c6f90436e19b48a0a986fa5e738c1;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 78764eb5..cdd66223 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,93 +1,121 @@ \n"; - echo ""; - echo "$org_title"; - echo ""; - $ishelp = substr(getenv(REQUEST_URI),-8); // If calling help, set left frame to 300 - - $bar_size = $left_size; - - if ($location_of_bar == 'right') - { - echo ""; - } else { - echo ""; - } +// Determine where the navigation frame should be +$location_of_bar = getPref($data_dir, $username, 'location_of_bar'); +if (isset($languages[$squirrelmail_language]['DIR']) && + strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') { + $temp_location_of_bar = 'right'; +} else { + $temp_location_of_bar = 'left'; +} +if ($location_of_bar == '') { + $location_of_bar = $temp_location_of_bar; +} -/** - There are three ways to call webmail.php - 1. webmail.php - - This just loads the default entry screen. - 2. webmail.php?right_frame=right_main.php&sort=X&startMessage=X&mailbox=XXXX - - This loads the frames starting at the given values. - 3. webmail.php?right_frame=folders.php - - Loads the frames with the Folder options in the right frame. +// Determine the main frame URL +/* + * There are three ways to call webmail.php + * 1. webmail.php + * - This just loads the default entry screen. + * 2. webmail.php?right_frame=right_main.php&sort=X&startMessage=X&mailbox=XXXX + * - This loads the frames starting at the given values. + * 3. webmail.php?right_frame=folders.php + * - Loads the frames with the Folder options in the right frame. + * + * This was done to create a pure HTML way of refreshing the folder list since + * we would like to use as little Javascript as possible. + * + * The test for // should catch any attempt to include off-site webpages into + * our frameset. + */ +if (empty($right_frame) || (strpos(urldecode($right_frame), '//') !== false)) { + $right_frame = ''; +} +if ( strpos($right_frame,'?') ) { + $right_frame_file = substr($right_frame,0,strpos($right_frame,'?')); +} else { + $right_frame_file = $right_frame; +} +switch($right_frame) { + case 'right_main.php': + $right_frame_url = "right_main.php?mailbox=".urlencode($mailbox) + . (!empty($sort)?"&sort=$sort":'') + . (!empty($startMessage)?"&startMessage=$startMessage":''); + break; + case 'options.php': + $right_frame_url = 'options.php'; + break; + case 'folders.php': + $right_frame_url = 'folders.php'; + break; + case 'compose.php': + $right_frame_url = 'compose.php?' . $mailtourl; + break; + case '': + $right_frame_url = 'right_main.php'; + break; + default: + $right_frame_url = urlencode($right_frame); + break; +} + +$oErrorHandler->setDelayedErrors(true); + +$oTemplate->assign('nav_size', $left_size); +$oTemplate->assign('nav_on_left', $location_of_bar=='left'); +$oTemplate->assign('right_frame_url', $right_frame_url); + +do_hook('webmail_top', $null); - This was done to create a pure HTML way of refreshing the folder list since - we would like to use as little Javascript as possible. -**/ - if ($right_frame == "right_main.php") { - $urlMailbox = urlencode($mailbox); - $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; - } else if ($right_frame == "options.php") { - $right_frame_url = "options.php"; - } else if ($right_frame == "folders.php") { - $right_frame_url = "folders.php"; - } else { - if (!isset($just_logged_in)) $just_logged_in = 0; - $right_frame_url = "right_main.php?just_logged_in=$just_logged_in"; - } +displayHtmlHeader($org_title, '', false, true); - if ($location_of_bar == 'right') - { - echo ""; - echo ""; - } - else - { - echo ""; - echo ""; - } +$oTemplate->display('webmail.tpl'); -?> - -