X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwebmail.php;h=cdd66223fd5247f0a91258a673b4bea1ecfdb6b4;hb=fdf58ef92a0b69f93bd08e22be831aa8172bfe62;hp=3f9c11199a59b2ae9166f5b170ebfecfa8f2a146;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 3f9c1119..cdd66223 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,56 +1,44 @@ \n"; -echo ''; -echo $org_title; -echo ''; - -$left_size = getPref($data_dir, $username, 'left_size'); -$location_of_bar = getPref($data_dir, $username, 'location_of_bar'); -if ($location_of_bar == '') { - $location_of_bar = 'left'; +if(!sqgetGlobalVar('mailtodata', $mailtodata)) { + $mailtourl = 'mailtodata='.urlencode($mailtodata); +} else { + $mailtourl = ''; } + +// Determine the size of the left frame +$left_size = getPref($data_dir, $username, 'left_size'); if ($left_size == "") { if (isset($default_left_size)) { $left_size = $default_left_size; @@ -58,15 +46,21 @@ if ($left_size == "") { else { $left_size = 200; } -} - -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; } +// Determine the main frame URL /* * There are three ways to call webmail.php * 1. webmail.php @@ -78,38 +72,50 @@ else { * * 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 (!isset($right_frame)) { - $right_frame = ""; -} - -if ($right_frame == 'right_main.php') { - $urlMailbox = urlencode($mailbox); - $right_frame_url = - "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; -} -elseif ($right_frame == 'options.php') { - $right_frame_url = 'options.php'; +if (empty($right_frame) || (strpos(urldecode($right_frame), '//') !== false)) { + $right_frame = ''; } -elseif ($right_frame == 'folders.php') { - $right_frame_url = 'folders.php'; +if ( strpos($right_frame,'?') ) { + $right_frame_file = substr($right_frame,0,strpos($right_frame,'?')); +} else { + $right_frame_file = $right_frame; } -elseif ($right_frame == 'compose.php') { - $right_frame_url = "compose.php?send_to=$rcptaddress"; -} -else { - $right_frame_url = 'right_main.php'; +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; } -if ($location_of_bar == 'right') { - echo ""; - echo ''; -} -else { - echo ''; - echo ""; -} +$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); + +displayHtmlHeader($org_title, '', false, true); + +$oTemplate->display('webmail.tpl'); -?> - -